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 d60df823d50..77203f7f1aa 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart @@ -72,7 +72,6 @@ class ForwardingListener implements Listener { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -84,7 +83,6 @@ class ForwardingListener implements Listener { listener?.beginClassDeclaration( begin, abstractToken, - macroToken, sealedToken, baseToken, interfaceToken, @@ -503,7 +501,6 @@ class ForwardingListener implements Listener { void beginNamedMixinApplication( Token beginToken, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -515,7 +512,6 @@ class ForwardingListener implements Listener { listener?.beginNamedMixinApplication( beginToken, abstractToken, - macroToken, sealedToken, baseToken, interfaceToken, @@ -1133,8 +1129,8 @@ class ForwardingListener implements Listener { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { - listener?.endImport(importKeyword, augmentToken, semicolon); + void endImport(Token importKeyword, Token? semicolon) { + listener?.endImport(importKeyword, semicolon); } @override diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart index 6a3a6b0e47a..b3abe9bb4e7 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart @@ -150,7 +150,6 @@ abstract class Listener implements UnescapeErrorListener { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -881,7 +880,6 @@ abstract class Listener implements UnescapeErrorListener { void beginNamedMixinApplication( Token beginToken, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -977,7 +975,7 @@ abstract class Listener implements UnescapeErrorListener { /// - conditional uris /// - prefix identifier /// - combinators - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { logEvent("Import"); } 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 4230be71790..b28ccaca67b 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart @@ -562,7 +562,6 @@ class Parser { /* beginToken = */ token.next!, /* modifierStart = */ token, /* keyword = */ next, - /* macroToken = */ null, /* sealedToken = */ null, /* baseToken = */ null, /* interfaceToken = */ null, @@ -592,16 +591,10 @@ class Parser { } } next = token.next!; - Token? macroToken; Token? sealedToken; Token? baseToken; Token? interfaceToken; - if (next.isIdentifier && - next.lexeme == 'macro' && - next.next!.isA(Keyword.CLASS)) { - macroToken = next; - next = next.next!; - } else if (next.isIdentifier && next.isA(Keyword.SEALED)) { + if (next.isIdentifier && next.isA(Keyword.SEALED)) { sealedToken = next; if (next.next!.isA(Keyword.CLASS) || next.next!.isA(Keyword.MIXIN) || @@ -635,7 +628,6 @@ class Parser { /* beginToken = */ beginToken, /* modifierStart = */ modifierStart, /* keyword = */ next, - /* macroToken = */ macroToken, /* sealedToken = */ sealedToken, /* baseToken = */ baseToken, /* interfaceToken = */ interfaceToken, @@ -681,7 +673,6 @@ class Parser { Token beginToken, Token modifierStart, Token keyword, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -694,7 +685,6 @@ class Parser { beginToken, modifierStart, keyword, - macroToken, sealedToken, baseToken, interfaceToken, @@ -791,7 +781,6 @@ class Parser { beginToken, modifierStart, keyword.next!, - macroToken, sealedToken, baseToken, interfaceToken, @@ -847,7 +836,6 @@ class Parser { Token beginToken, Token modifierStart, Token classKeyword, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -875,7 +863,6 @@ class Parser { return parseClassOrNamedMixinApplication( beginToken, context.abstractToken, - macroToken, sealedToken, baseToken, interfaceToken, @@ -974,21 +961,17 @@ class Parser { listener.beginUncategorizedTopLevelDeclaration(importKeyword); listener.beginImport(importKeyword); Token start = importKeyword; - Token? augmentToken; - if (start.next!.isIdentifier && start.next!.lexeme == 'augment') { - start = augmentToken = start.next!; - } Token token = ensureLiteralString(start); Token uri = token; token = parseConditionalUriStar(token); token = parseImportPrefixOpt(token); token = parseCombinatorStar(token).next!; if (token.isA(TokenType.SEMICOLON)) { - listener.endImport(importKeyword, augmentToken, token); + listener.endImport(importKeyword, token); return token; } else { // Recovery - listener.endImport(importKeyword, augmentToken, /* semicolon = */ null); + listener.endImport(importKeyword, /* semicolon = */ null); return parseImportRecovery(uri); } } @@ -2938,7 +2921,6 @@ class Parser { Token parseClassOrNamedMixinApplication( Token beginToken, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -2995,7 +2977,6 @@ class Parser { listener.beginNamedMixinApplication( beginToken, abstractToken, - macroToken, sealedToken, baseToken, interfaceToken, @@ -3009,7 +2990,6 @@ class Parser { listener.beginClassDeclaration( beginToken, abstractToken, - macroToken, sealedToken, baseToken, interfaceToken, diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart index 0c54293bc2c..df5b58b764a 100644 --- a/pkg/analyzer/lib/src/fasta/ast_builder.dart +++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart @@ -114,9 +114,6 @@ class AstBuilder extends StackListener { /// Whether the 'enhanced_parts' feature is enabled. final bool enableEnhancedParts; - /// Whether the 'macros' feature is enabled. - final bool enableMacros; - /// `true` if records are enabled final bool enableRecords; @@ -171,7 +168,6 @@ class AstBuilder extends StackListener { enableSuperParameters = _featureSet.isEnabled(Feature.super_parameters), enableEnhancedEnums = _featureSet.isEnabled(Feature.enhanced_enums), enableEnhancedParts = _featureSet.isEnabled(Feature.enhanced_parts), - enableMacros = _featureSet.isEnabled(Feature.macros), enableRecords = _featureSet.isEnabled(Feature.records), enableUnnamedLibraries = _featureSet.isEnabled(Feature.unnamedLibraries), enableInlineClass = _featureSet.isEnabled(Feature.inline_class), @@ -231,7 +227,6 @@ class AstBuilder extends StackListener { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -242,16 +237,6 @@ class AstBuilder extends StackListener { ) { assert(_classLikeBuilder == null); push(_Modifiers()..abstractKeyword = abstractToken); - if (!enableMacros) { - if (macroToken != null) { - _reportFeatureNotEnabled( - feature: ExperimentalFeatures.macros, - startToken: macroToken, - ); - // Pretend that 'macro' didn't occur while this feature is incomplete. - macroToken = null; - } - } if (!enableSealedClass) { if (sealedToken != null) { _reportFeatureNotEnabled( @@ -298,7 +283,6 @@ class AstBuilder extends StackListener { mixinToken = null; } } - push(macroToken ?? NullValues.Token); push(sealedToken ?? NullValues.Token); push(baseToken ?? NullValues.Token); push(interfaceToken ?? NullValues.Token); @@ -514,7 +498,6 @@ class AstBuilder extends StackListener { void beginNamedMixinApplication( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -524,16 +507,6 @@ class AstBuilder extends StackListener { Token name, ) { push(_Modifiers()..abstractKeyword = abstractToken); - if (!enableMacros) { - if (macroToken != null) { - _reportFeatureNotEnabled( - feature: ExperimentalFeatures.macros, - startToken: macroToken, - ); - // Pretend that 'macro' didn't occur while this feature is incomplete. - macroToken = null; - } - } if (!enableSealedClass) { if (sealedToken != null) { _reportFeatureNotEnabled( @@ -579,7 +552,6 @@ class AstBuilder extends StackListener { mixinToken = null; } } - push(macroToken ?? NullValues.Token); push(sealedToken ?? NullValues.Token); push(baseToken ?? NullValues.Token); push(interfaceToken ?? NullValues.Token); @@ -827,7 +799,6 @@ class AstBuilder extends StackListener { comment: null, metadata: null, abstractKeyword: null, - macroKeyword: null, sealedKeyword: null, baseKeyword: null, interfaceKeyword: null, @@ -2189,7 +2160,7 @@ class AstBuilder extends StackListener { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { assert(optional('import', importKeyword)); assert(optionalOrNull(';', semicolon)); debugEvent("Import"); @@ -2203,17 +2174,6 @@ class AstBuilder extends StackListener { var metadata = pop() as List?; var comment = _findComment(metadata, importKeyword); - if (!enableMacros) { - if (augmentToken != null) { - _reportFeatureNotEnabled( - feature: ExperimentalFeatures.macros, - startToken: augmentToken, - ); - // Pretend that 'augment' didn't occur while this feature is incomplete. - augmentToken = null; - } - } - directives.add( ImportDirectiveImpl( comment: comment, @@ -2620,7 +2580,6 @@ class AstBuilder extends StackListener { var interfaceKeyword = pop(NullValues.Token) as Token?; var baseKeyword = pop(NullValues.Token) as Token?; var sealedKeyword = pop(NullValues.Token) as Token?; - pop(NullValues.Token) as Token?; // macroKeyword var modifiers = pop() as _Modifiers?; var typeParameters = pop() as TypeParameterListImpl?; var name = pop() as SimpleIdentifierImpl; @@ -3879,7 +3838,6 @@ class AstBuilder extends StackListener { var interfaceKeyword = pop(NullValues.Token) as Token?; var baseKeyword = pop(NullValues.Token) as Token?; var sealedKeyword = pop(NullValues.Token) as Token?; - var macroKeyword = pop(NullValues.Token) as Token?; var modifiers = pop() as _Modifiers?; var typeParameters = pop() as TypeParameterListImpl?; var name = pop() as SimpleIdentifierImpl; @@ -3892,7 +3850,6 @@ class AstBuilder extends StackListener { comment: comment, metadata: metadata, abstractKeyword: abstractKeyword, - macroKeyword: macroKeyword, sealedKeyword: sealedKeyword, baseKeyword: baseKeyword, interfaceKeyword: interfaceKeyword, @@ -6420,7 +6377,6 @@ class AstBuilder extends StackListener { class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder { final Token? augmentKeyword; final Token? abstractKeyword; - final Token? macroKeyword; final Token? sealedKeyword; final Token? baseKeyword; final Token? interfaceKeyword; @@ -6445,7 +6401,6 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder { required super.rightBracket, required this.augmentKeyword, required this.abstractKeyword, - required this.macroKeyword, required this.sealedKeyword, required this.baseKeyword, required this.interfaceKeyword, diff --git a/pkg/analyzer/test/generated/parser_fasta_listener.dart b/pkg/analyzer/test/generated/parser_fasta_listener.dart index fe29863e412..75a44a8ba51 100644 --- a/pkg/analyzer/test/generated/parser_fasta_listener.dart +++ b/pkg/analyzer/test/generated/parser_fasta_listener.dart @@ -89,7 +89,6 @@ class ForwardingTestListener extends ForwardingListener { void beginClassDeclaration( Token beginToken, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -101,7 +100,6 @@ class ForwardingTestListener extends ForwardingListener { super.beginClassDeclaration( beginToken, abstractToken, - macroToken, sealedToken, baseToken, interfaceToken, @@ -489,7 +487,6 @@ class ForwardingTestListener extends ForwardingListener { void beginNamedMixinApplication( Token beginToken, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -501,7 +498,6 @@ class ForwardingTestListener extends ForwardingListener { super.beginNamedMixinApplication( beginToken, abstractToken, - macroToken, sealedToken, baseToken, interfaceToken, @@ -1073,9 +1069,9 @@ class ForwardingTestListener extends ForwardingListener { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { end('Import'); - super.endImport(importKeyword, augmentToken, semicolon); + super.endImport(importKeyword, semicolon); } @override diff --git a/pkg/analyzer/tool/summary/mini_ast.dart b/pkg/analyzer/tool/summary/mini_ast.dart index 986aa307b92..3a4f1095e1a 100644 --- a/pkg/analyzer/tool/summary/mini_ast.dart +++ b/pkg/analyzer/tool/summary/mini_ast.dart @@ -346,7 +346,7 @@ class MiniAstBuilder extends StackListener { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { debugEvent("Import"); pop(NullValues.Prefix); // Prefix identifier pop(); // URI diff --git a/pkg/front_end/lib/src/base/import.dart b/pkg/front_end/lib/src/base/import.dart index 81ef2088588..a90897ada4b 100644 --- a/pkg/front_end/lib/src/base/import.dart +++ b/pkg/front_end/lib/src/base/import.dart @@ -18,8 +18,6 @@ class Import { final PrefixFragment? prefixFragment; - final bool isAugmentationImport; - final bool deferred; final String? prefix; @@ -41,17 +39,16 @@ class Import { /// This set in [SourceLibraryBuilder._addDependencies]. LibraryDependency? libraryDependency; - Import( - SourceCompilationUnit importer, - this.importedCompilationUnit, - this.isAugmentationImport, - this.deferred, - this.prefix, - this.combinators, - this.configurations, - Uri fileUri, - this.importOffset, - this.prefixOffset, { + Import({ + required SourceCompilationUnit importer, + required this.importedCompilationUnit, + required this.deferred, + required this.prefix, + required this.combinators, + required this.configurations, + required Uri fileUri, + required this.importOffset, + required this.prefixOffset, this.nativeImportPath, }) : prefixFragment = createPrefixFragment( prefix, diff --git a/pkg/front_end/lib/src/base/modifiers.dart b/pkg/front_end/lib/src/base/modifiers.dart index e1c0ad51f58..8009e8dbdb4 100644 --- a/pkg/front_end/lib/src/base/modifiers.dart +++ b/pkg/front_end/lib/src/base/modifiers.dart @@ -33,9 +33,7 @@ const int _lateMask = _staticMask << 1; const int _requiredMask = _lateMask << 1; -const int _macroMask = _requiredMask << 1; - -const int _sealedMask = _macroMask << 1; +const int _sealedMask = _requiredMask << 1; const int _baseMask = _sealedMask << 1; @@ -131,9 +129,6 @@ extension type const Modifiers(int _mask) implements Object { /// lateToken: new SimpleToken(Keyword.LATE, -1)), /// Modifiers.Late) /// DartDocTest(Modifiers.from( - /// macroToken: new StringToken(TokenType.IDENTIFIER, 'macro', -1)), - /// Modifiers.Macro) - /// DartDocTest(Modifiers.from( /// mixinToken: new SimpleToken(Keyword.MIXIN, -1)), /// Modifiers.Mixin) /// DartDocTest(Modifiers.from( @@ -173,7 +168,6 @@ extension type const Modifiers(int _mask) implements Object { Token? finalToken, Token? interfaceToken, Token? lateToken, - Token? macroToken, Token? mixinToken, Token? requiredToken, Token? sealedToken, @@ -188,11 +182,6 @@ extension type const Modifiers(int _mask) implements Object { assert(finalToken == null || finalToken.type == Keyword.FINAL); assert(interfaceToken == null || interfaceToken.type == Keyword.INTERFACE); assert(lateToken == null || lateToken.type == Keyword.LATE); - assert( - macroToken == null || - // Coverage-ignore(suite): Not run. - macroToken.lexeme == 'macro', - ); assert(mixinToken == null || mixinToken.type == Keyword.MIXIN); assert(requiredToken == null || requiredToken.type == Keyword.REQUIRED); assert(sealedToken == null || sealedToken.type == Keyword.SEALED); @@ -208,7 +197,6 @@ extension type const Modifiers(int _mask) implements Object { (finalToken != null ? _finalMask : 0) | (interfaceToken != null ? _interfaceMask : 0) | (lateToken != null ? _lateMask : 0) | - (macroToken != null ? _macroMask : 0) | (mixinToken != null ? _mixinMask : 0) | (requiredToken != null ? _requiredMask : 0) | (sealedToken != null ? _sealedMask : 0) | @@ -341,26 +329,12 @@ extension type const Modifiers(int _mask) implements Object { /// ``` /// DartDocTest(Modifiers.Required.isRequired, true) /// DartDocTest(Modifiers.Required.isEmpty, false) - /// DartDocTest(Modifiers.Required.isMacro, false) /// ``` static const Modifiers Required = const Modifiers(_requiredMask); /// Returns `true` if the set of modifiers contains `required'. bool get isRequired => (_mask & _requiredMask) != 0; - /// The set of modifiers containing only `macro`. - /// - /// ``` - /// DartDocTest(Modifiers.Macro.isMacro, true) - /// DartDocTest(Modifiers.Macro.isEmpty, false) - /// DartDocTest(Modifiers.Macro.isSealed, false) - /// ``` - static const Modifiers Macro = const Modifiers(_macroMask); - - // Coverage-ignore(suite): Not run. - /// Returns `true` if the set of modifiers contains `macro'. - bool get isMacro => (_mask & _macroMask) != 0; - /// The set of modifiers containing only `sealed`. /// /// ``` @@ -554,7 +528,6 @@ extension type const Modifiers(int _mask) implements Object { /// Modifiers.InitializingFormal.containsSyntacticModifiers(), false) /// DartDocTest(Modifiers.Interface.containsSyntacticModifiers(), true) /// DartDocTest(Modifiers.Late.containsSyntacticModifiers(), true) - /// DartDocTest(Modifiers.Macro.containsSyntacticModifiers(), true) /// DartDocTest(Modifiers.Mixin.containsSyntacticModifiers(), true) /// DartDocTest( /// Modifiers.NamedMixinApplication.containsSyntacticModifiers(), false) diff --git a/pkg/front_end/lib/src/source/diet_listener.dart b/pkg/front_end/lib/src/source/diet_listener.dart index efdeab44882..5af2e23427a 100644 --- a/pkg/front_end/lib/src/source/diet_listener.dart +++ b/pkg/front_end/lib/src/source/diet_listener.dart @@ -602,7 +602,7 @@ class DietListener extends StackListenerImpl { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { debugEvent("Import"); Object? name = pop(NullValues.Prefix); @@ -612,11 +612,7 @@ class DietListener extends StackListenerImpl { // Native imports must be skipped because they aren't assigned corresponding // LibraryDependency nodes. - Token importUriToken = - augmentToken - // Coverage-ignore(suite): Not run. - ?.next ?? - importKeyword.next!; + Token importUriToken = importKeyword.next!; String importUri = unescapeString( importUriToken.lexeme, importUriToken, @@ -1080,7 +1076,6 @@ class DietListener extends StackListenerImpl { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, diff --git a/pkg/front_end/lib/src/source/directive_listener.dart b/pkg/front_end/lib/src/source/directive_listener.dart index 0caff27ad68..076f0ba2b66 100644 --- a/pkg/front_end/lib/src/source/directive_listener.dart +++ b/pkg/front_end/lib/src/source/directive_listener.dart @@ -82,7 +82,7 @@ class DirectiveListener extends Listener { } @override - void endImport(Token? import, Token? augmentToken, Token? semicolon) { + void endImport(Token? import, Token? semicolon) { imports.add(new NamespaceDirective.import(_uri, _combinators)); _uri = null; _combinators = null; diff --git a/pkg/front_end/lib/src/source/fragment_factory.dart b/pkg/front_end/lib/src/source/fragment_factory.dart index 05ce6cb52ee..16c6d0aad22 100644 --- a/pkg/front_end/lib/src/source/fragment_factory.dart +++ b/pkg/front_end/lib/src/source/fragment_factory.dart @@ -198,7 +198,6 @@ abstract class FragmentFactory { OffsetMap? offsetMap, Token? importKeyword, required List? metadata, - required bool isAugmentationImport, required String uri, required List? configurations, required String? prefix, diff --git a/pkg/front_end/lib/src/source/fragment_factory_impl.dart b/pkg/front_end/lib/src/source/fragment_factory_impl.dart index 6d16dfa2923..24cb11af35a 100644 --- a/pkg/front_end/lib/src/source/fragment_factory_impl.dart +++ b/pkg/front_end/lib/src/source/fragment_factory_impl.dart @@ -920,7 +920,6 @@ class FragmentFactoryImpl implements FragmentFactory { OffsetMap? offsetMap, Token? importKeyword, required List? metadata, - required bool isAugmentationImport, required String uri, required List? configurations, required String? prefix, @@ -970,31 +969,22 @@ class FragmentFactoryImpl implements FragmentFactory { compilationUnit = loader.read( resolvedUri, uriOffset, - origin: isAugmentationImport - ? - // Coverage-ignore(suite): Not run. - _augmentationRoot - : null, + origin: null, accessor: _compilationUnit, - referencesFromIndex: isAugmentationImport - ? - // Coverage-ignore(suite): Not run. - _indexedLibrary - : null, + referencesFromIndex: null, ); } Import import = new Import( - _compilationUnit, - compilationUnit, - isAugmentationImport, - deferred, - prefix, - combinators, - configurations, - _compilationUnit.fileUri, - charOffset, - prefixCharOffset, + importer: _compilationUnit, + importedCompilationUnit: compilationUnit, + deferred: deferred, + prefix: prefix, + combinators: combinators, + configurations: configurations, + fileUri: _compilationUnit.fileUri, + importOffset: charOffset, + prefixOffset: prefixCharOffset, nativeImportPath: nativePath, ); _compilationUnitRegistry.registerImport(import); diff --git a/pkg/front_end/lib/src/source/outline_builder.dart b/pkg/front_end/lib/src/source/outline_builder.dart index cd04aa6e80a..e14e4064181 100644 --- a/pkg/front_end/lib/src/source/outline_builder.dart +++ b/pkg/front_end/lib/src/source/outline_builder.dart @@ -739,7 +739,7 @@ class OutlineBuilder extends StackListenerImpl { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { debugEvent("endImport"); assert( checkState(importKeyword, [ @@ -773,22 +773,10 @@ class OutlineBuilder extends StackListenerImpl { return; } - if (augmentToken != null) { - // Coverage-ignore-block(suite): Not run. - if (reportIfNotEnabled( - libraryFeatures.macros, - augmentToken.charOffset, - augmentToken.length, - )) { - augmentToken = null; - } - } - bool isAugmentationImport = augmentToken != null; _builderFactory.addImport( offsetMap: _offsetMap, importKeyword: importKeyword, metadata: metadata, - isAugmentationImport: isAugmentationImport, uri: uri, configurations: configurations, prefix: prefix?.name, @@ -1105,7 +1093,6 @@ class OutlineBuilder extends StackListenerImpl { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -1121,15 +1108,6 @@ class OutlineBuilder extends StackListenerImpl { pushDeclarationContext(DeclarationContext.Class); NominalParameters? typeParameters = peek(NullValues.NominalParameters) as NominalParameters?; - if (macroToken != null) { - if (reportIfNotEnabled( - libraryFeatures.macros, - macroToken.charOffset, - macroToken.length, - )) { - macroToken = null; - } - } if (sealedToken != null) { if (reportIfNotEnabled( libraryFeatures.sealedClass, @@ -1182,7 +1160,6 @@ class OutlineBuilder extends StackListenerImpl { ); Modifiers modifiers = Modifiers.from( abstractToken: abstractToken, - macroToken: macroToken, sealedToken: sealedToken, baseToken: baseToken, interfaceToken: interfaceToken, @@ -1274,7 +1251,6 @@ class OutlineBuilder extends StackListenerImpl { void beginNamedMixinApplication( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -1295,15 +1271,6 @@ class OutlineBuilder extends StackListenerImpl { name.charOffset, typeParameters?.fragments, ); - if (macroToken != null) { - if (reportIfNotEnabled( - libraryFeatures.macros, - macroToken.charOffset, - macroToken.length, - )) { - macroToken = null; - } - } if (sealedToken != null) { if (reportIfNotEnabled( libraryFeatures.sealedClass, @@ -1352,7 +1319,6 @@ class OutlineBuilder extends StackListenerImpl { push( Modifiers.from( abstractToken: abstractToken, - macroToken: macroToken, sealedToken: sealedToken, baseToken: baseToken, interfaceToken: interfaceToken, diff --git a/pkg/front_end/lib/src/source/source_compilation_unit.dart b/pkg/front_end/lib/src/source/source_compilation_unit.dart index a7ba8d4f794..fcca1cecb37 100644 --- a/pkg/front_end/lib/src/source/source_compilation_unit.dart +++ b/pkg/front_end/lib/src/source/source_compilation_unit.dart @@ -1230,16 +1230,15 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit { referencesFromIndex: indexedLibrary, ); Import import = new Import( - this, - compilationUnit, - false, - deferred, - prefix, - combinators, - null, - fileUri, - -1, - -1, + importer: this, + importedCompilationUnit: compilationUnit, + deferred: deferred, + prefix: prefix, + combinators: combinators, + configurations: null, + fileUri: fileUri, + importOffset: -1, + prefixOffset: -1, nativeImportPath: null, ); _compilationUnitData.registerImport(import); diff --git a/pkg/front_end/lib/src/util/parser_ast_helper.dart b/pkg/front_end/lib/src/util/parser_ast_helper.dart index 323557d7073..5c550833fab 100644 --- a/pkg/front_end/lib/src/util/parser_ast_helper.dart +++ b/pkg/front_end/lib/src/util/parser_ast_helper.dart @@ -272,7 +272,6 @@ abstract class AbstractParserAstListener implements Listener { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -285,7 +284,6 @@ abstract class AbstractParserAstListener implements Listener { ParserAstType.BEGIN, begin: begin, abstractToken: abstractToken, - macroToken: macroToken, sealedToken: sealedToken, baseToken: baseToken, interfaceToken: interfaceToken, @@ -1353,7 +1351,6 @@ abstract class AbstractParserAstListener implements Listener { void beginNamedMixinApplication( Token beginToken, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -1366,7 +1363,6 @@ abstract class AbstractParserAstListener implements Listener { ParserAstType.BEGIN, beginToken: beginToken, abstractToken: abstractToken, - macroToken: macroToken, sealedToken: sealedToken, baseToken: baseToken, interfaceToken: interfaceToken, @@ -1521,11 +1517,10 @@ abstract class AbstractParserAstListener implements Listener { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { ImportEnd data = new ImportEnd( ParserAstType.END, importKeyword: importKeyword, - augmentToken: augmentToken, semicolon: semicolon, ); seen(data); @@ -4417,7 +4412,6 @@ class ClassOrMixinOrNamedMixinApplicationPreludeBegin extends ParserAstNode { class ClassDeclarationBegin extends ParserAstNode { final Token begin; final Token? abstractToken; - final Token? macroToken; final Token? sealedToken; final Token? baseToken; final Token? interfaceToken; @@ -4430,7 +4424,6 @@ class ClassDeclarationBegin extends ParserAstNode { ParserAstType type, { required this.begin, this.abstractToken, - this.macroToken, this.sealedToken, this.baseToken, this.interfaceToken, @@ -4444,7 +4437,6 @@ class ClassDeclarationBegin extends ParserAstNode { Map get deprecatedArguments => { "begin": begin, "abstractToken": abstractToken, - "macroToken": macroToken, "sealedToken": sealedToken, "baseToken": baseToken, "interfaceToken": interfaceToken, @@ -6207,7 +6199,6 @@ class MixinWithClauseHandle extends ParserAstNode { class NamedMixinApplicationBegin extends ParserAstNode { final Token beginToken; final Token? abstractToken; - final Token? macroToken; final Token? sealedToken; final Token? baseToken; final Token? interfaceToken; @@ -6220,7 +6211,6 @@ class NamedMixinApplicationBegin extends ParserAstNode { ParserAstType type, { required this.beginToken, this.abstractToken, - this.macroToken, this.sealedToken, this.baseToken, this.interfaceToken, @@ -6234,7 +6224,6 @@ class NamedMixinApplicationBegin extends ParserAstNode { Map get deprecatedArguments => { "beginToken": beginToken, "abstractToken": abstractToken, - "macroToken": macroToken, "sealedToken": sealedToken, "baseToken": baseToken, "interfaceToken": interfaceToken, @@ -6500,20 +6489,14 @@ class ImportPrefixHandle extends ParserAstNode { class ImportEnd extends ParserAstNode { final Token importKeyword; - final Token? augmentToken; final Token? semicolon; - ImportEnd( - ParserAstType type, { - required this.importKeyword, - this.augmentToken, - this.semicolon, - }) : super("Import", type); + ImportEnd(ParserAstType type, {required this.importKeyword, this.semicolon}) + : super("Import", type); @override Map get deprecatedArguments => { "importKeyword": importKeyword, - "augmentToken": augmentToken, "semicolon": semicolon, }; diff --git a/pkg/front_end/lib/src/util/textual_outline.dart b/pkg/front_end/lib/src/util/textual_outline.dart index 985df45fd51..e7088bb4cb5 100644 --- a/pkg/front_end/lib/src/util/textual_outline.dart +++ b/pkg/front_end/lib/src/util/textual_outline.dart @@ -1108,7 +1108,7 @@ class TextualOutlineListener extends Listener { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { if (semicolon != null) { importExportsStartToChunk[importKeyword] = new _ImportChunk( importKeyword, diff --git a/pkg/front_end/parser_testcases/also-nnbd/issue_40288.dart.expect b/pkg/front_end/parser_testcases/also-nnbd/issue_40288.dart.expect index dad97990787..627be438d70 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/issue_40288.dart.expect +++ b/pkg/front_end/parser_testcases/also-nnbd/issue_40288.dart.expect @@ -27,7 +27,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'late' as a name here., null, {lexeme: late}], late, late) handleIdentifier(late, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, late) + beginClassDeclaration(class, null, null, null, null, null, null, null, late) handleNoPrimaryConstructor(DeclarationKind.Class, late, null) handleNoType(late) handleClassExtends(null, 1) @@ -60,7 +60,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'required' as a name here., null, {lexeme: required}], required, required) handleIdentifier(required, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, required) + beginClassDeclaration(class, null, null, null, null, null, null, null, required) handleNoPrimaryConstructor(DeclarationKind.Class, required, null) handleNoType(required) handleClassExtends(null, 1) @@ -92,7 +92,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/also-nnbd/issue_40288.dart.intertwined.expect b/pkg/front_end/parser_testcases/also-nnbd/issue_40288.dart.intertwined.expect index 5edb8a843f1..c5a4c40c9f3 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/issue_40288.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/also-nnbd/issue_40288.dart.intertwined.expect @@ -6,15 +6,15 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(late, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, late) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, late) parseClass(late, class, class, null, late) parsePrimaryConstructorOpt(DeclarationKind.Class, late, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, late, null) @@ -76,15 +76,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(required, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, required) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, required) parseClass(required, class, class, null, required) parsePrimaryConstructorOpt(DeclarationKind.Class, required, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, required, null) @@ -146,13 +146,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/also-nnbd/issue_40288_prime.dart.expect b/pkg/front_end/parser_testcases/also-nnbd/issue_40288_prime.dart.expect index 4bc18062180..f6bb42c71d3 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/issue_40288_prime.dart.expect +++ b/pkg/front_end/parser_testcases/also-nnbd/issue_40288_prime.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Xlate, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Xlate) + beginClassDeclaration(class, null, null, null, null, null, null, null, Xlate) handleNoPrimaryConstructor(DeclarationKind.Class, Xlate, null) handleNoType(Xlate) handleClassExtends(null, 1) @@ -36,7 +36,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Xrequired, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Xrequired) + beginClassDeclaration(class, null, null, null, null, null, null, null, Xrequired) handleNoPrimaryConstructor(DeclarationKind.Class, Xrequired, null) handleNoType(Xrequired) handleClassExtends(null, 1) @@ -68,7 +68,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/also-nnbd/issue_40288_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/also-nnbd/issue_40288_prime.dart.intertwined.expect index 18955256d26..45a6236e21c 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/issue_40288_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/also-nnbd/issue_40288_prime.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Xlate) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Xlate) parseClass(Xlate, class, class, null, Xlate) parsePrimaryConstructorOpt(DeclarationKind.Class, Xlate, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Xlate, null) @@ -74,13 +74,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Xrequired) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Xrequired) parseClass(Xrequired, class, class, null, Xrequired) parsePrimaryConstructorOpt(DeclarationKind.Class, Xrequired, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Xrequired, null) @@ -142,13 +142,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/also-nnbd/nullable_type_argument.dart.expect b/pkg/front_end/parser_testcases/also-nnbd/nullable_type_argument.dart.expect index 2885d89b739..1da1368eb4a 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/nullable_type_argument.dart.expect +++ b/pkg/front_end/parser_testcases/also-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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -28,7 +28,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables(implements) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/also-nnbd/nullable_type_argument.dart.intertwined.expect b/pkg/front_end/parser_testcases/also-nnbd/nullable_type_argument.dart.intertwined.expect index 10452604d2a..5bb6e0f9229 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/nullable_type_argument.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/also-nnbd/nullable_type_argument.dart.intertwined.expect @@ -6,8 +6,8 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(>, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -43,13 +43,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) diff --git a/pkg/front_end/parser_testcases/also-nnbd/use_late_in_non_nnbd.dart.expect b/pkg/front_end/parser_testcases/also-nnbd/use_late_in_non_nnbd.dart.expect index bb2cc61b31a..fdabf412b5f 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/use_late_in_non_nnbd.dart.expect +++ b/pkg/front_end/parser_testcases/also-nnbd/use_late_in_non_nnbd.dart.expect @@ -214,7 +214,7 @@ beginCompilationUnit(int) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/also-nnbd/use_late_in_non_nnbd.dart.intertwined.expect b/pkg/front_end/parser_testcases/also-nnbd/use_late_in_non_nnbd.dart.intertwined.expect index 767e60e21c6..d52d8db54ed 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/use_late_in_non_nnbd.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/also-nnbd/use_late_in_non_nnbd.dart.intertwined.expect @@ -331,13 +331,13 @@ parseUnit(int) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/also-nnbd/use_required_in_non_nnbd.dart.expect b/pkg/front_end/parser_testcases/also-nnbd/use_required_in_non_nnbd.dart.expect index 4e2d5140c17..75eeab510bf 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/use_required_in_non_nnbd.dart.expect +++ b/pkg/front_end/parser_testcases/also-nnbd/use_required_in_non_nnbd.dart.expect @@ -120,7 +120,7 @@ beginCompilationUnit(void) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/also-nnbd/use_required_in_non_nnbd.dart.intertwined.expect b/pkg/front_end/parser_testcases/also-nnbd/use_required_in_non_nnbd.dart.intertwined.expect index 201811f43d3..fa0e3b428b0 100644 --- a/pkg/front_end/parser_testcases/also-nnbd/use_required_in_non_nnbd.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/also-nnbd/use_required_in_non_nnbd.dart.intertwined.expect @@ -234,13 +234,13 @@ parseUnit(void) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 d1aa91c14be..522398f7d03 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, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) 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 da894ad4fe4..9b295286cab 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -747,7 +747,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, 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 703a96e5d9d..53576d77669 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, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) 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 a108f9f6c45..2d811c9c5a3 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) 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 30356424033..b481e5e73d4 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(augment) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(augment, null, null, null, null, null, null, augment, null, Class) + beginClassDeclaration(augment, null, null, null, null, null, augment, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) @@ -189,7 +189,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(augment) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(augment, abstract, null, null, null, null, null, augment, null, Class) + beginClassDeclaration(augment, abstract, null, null, null, null, augment, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) 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 243560bcace..c197cdd6cf1 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 @@ -340,13 +340,13 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(augment, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(augment, null, null, null, null, null, null, augment, null, class) + parseTopLevelKeywordDeclaration(augment, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(augment, null, null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(augment) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(augment, null, null, null, null, null, null, augment, null, Class) + listener: beginClassDeclaration(augment, null, null, null, null, null, augment, null, Class) parseClass(Class, augment, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -369,13 +369,13 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(augment, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(augment, abstract, null, null, null, null, null, augment, null, class) + parseTopLevelKeywordDeclaration(augment, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(augment, abstract, null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(augment) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(augment, abstract, null, null, null, null, null, augment, null, Class) + listener: beginClassDeclaration(augment, abstract, null, null, null, null, augment, null, Class) parseClass(Class, augment, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -398,7 +398,7 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(augment, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(augment, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(augment, augment, null, 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 a36cbc6868f..0203b6af2f1 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 @@ -521,7 +521,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(augment) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(augment, null, null, null, null, null, null, augment, null, Class) + beginClassDeclaration(augment, null, null, null, null, null, augment, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) @@ -538,7 +538,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, null, null, augment, null, Class) + beginClassDeclaration(abstract, abstract, null, null, null, null, augment, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) @@ -556,7 +556,7 @@ beginCompilationUnit(augment) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) handleRecoverableError(MixinApplicationClassAugmentation, augment, augment) - beginNamedMixinApplication(augment, null, null, null, null, null, null, augment, null, Class) + beginNamedMixinApplication(augment, null, null, null, null, null, augment, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -575,7 +575,7 @@ beginCompilationUnit(augment) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) handleRecoverableError(MixinApplicationClassAugmentation, augment, augment) - beginNamedMixinApplication(abstract, abstract, null, null, null, null, null, augment, null, Class) + beginNamedMixinApplication(abstract, abstract, null, null, null, null, augment, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -593,7 +593,7 @@ beginCompilationUnit(augment) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) handleRecoverableError(MixinApplicationClassAugmentation, augment, augment) - beginNamedMixinApplication(augment, null, null, null, null, null, null, augment, null, Class) + beginNamedMixinApplication(augment, null, null, null, null, null, augment, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -611,7 +611,7 @@ beginCompilationUnit(augment) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) handleRecoverableError(MixinApplicationClassAugmentation, augment, augment) - beginNamedMixinApplication(augment, abstract, null, null, null, null, null, augment, null, Class) + beginNamedMixinApplication(augment, abstract, null, null, null, null, augment, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) 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 2d0bf19b8de..c2e9514ea28 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 @@ -702,7 +702,7 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(augment, ;, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(augment, ;, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) reportRecoverableErrorWithToken(augment, Template(DuplicatedModifier)) listener: handleRecoverableError(Message[Template(DuplicatedModifier), The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment) parseMixin(augment, augment, null, mixin) @@ -727,15 +727,15 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(augment, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(augment, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) reportRecoverableErrorWithToken(augment, Template(DuplicatedModifier)) listener: handleRecoverableError(Message[Template(DuplicatedModifier), The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment) - parseClassOrNamedMixinApplication(augment, null, null, null, null, null, null, augment, null, class) + parseClassOrNamedMixinApplication(augment, null, null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(augment) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(augment, null, null, null, null, null, null, augment, null, Class) + listener: beginClassDeclaration(augment, null, null, null, null, null, augment, null, Class) parseClass(Class, augment, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -758,15 +758,15 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(abstract, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) reportRecoverableError(augment, Message[Template(ModifierOutOfOrder), The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {modifier: augment, expectedLaterModifier: abstract}]) listener: handleRecoverableError(Message[Template(ModifierOutOfOrder), The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {modifier: augment, expectedLaterModifier: abstract}], augment, augment) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, augment, null, class) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, augment, null, Class) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, augment, null, Class) parseClass(Class, abstract, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -789,17 +789,17 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(augment, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(augment, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) reportRecoverableErrorWithToken(augment, Template(DuplicatedModifier)) listener: handleRecoverableError(Message[Template(DuplicatedModifier), The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment) - parseClassOrNamedMixinApplication(augment, null, null, null, null, null, null, augment, null, class) + parseClassOrNamedMixinApplication(augment, null, null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(augment) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) reportRecoverableError(augment, MixinApplicationClassAugmentation) listener: handleRecoverableError(MixinApplicationClassAugmentation, augment, augment) - listener: beginNamedMixinApplication(augment, null, null, null, null, null, null, augment, null, Class) + listener: beginNamedMixinApplication(augment, null, null, null, null, null, augment, null, Class) parseNamedMixinApplication(Class, augment, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) @@ -819,17 +819,17 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(abstract, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) reportRecoverableError(augment, Message[Template(ModifierOutOfOrder), The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {modifier: augment, expectedLaterModifier: abstract}]) listener: handleRecoverableError(Message[Template(ModifierOutOfOrder), The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {modifier: augment, expectedLaterModifier: abstract}], augment, augment) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, augment, null, class) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) reportRecoverableError(augment, MixinApplicationClassAugmentation) listener: handleRecoverableError(MixinApplicationClassAugmentation, augment, augment) - listener: beginNamedMixinApplication(abstract, abstract, null, null, null, null, null, augment, null, Class) + listener: beginNamedMixinApplication(abstract, abstract, null, null, null, null, augment, null, Class) parseNamedMixinApplication(Class, abstract, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) @@ -849,15 +849,15 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(augment, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(augment, null, null, null, null, null, null, augment, null, class) + parseTopLevelKeywordDeclaration(augment, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(augment, null, null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(augment) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) reportRecoverableError(augment, MixinApplicationClassAugmentation) listener: handleRecoverableError(MixinApplicationClassAugmentation, augment, augment) - listener: beginNamedMixinApplication(augment, null, null, null, null, null, null, augment, null, Class) + listener: beginNamedMixinApplication(augment, null, null, null, null, null, augment, null, Class) parseNamedMixinApplication(Class, augment, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) @@ -877,15 +877,15 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(augment, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(augment, abstract, null, null, null, null, null, augment, null, class) + parseTopLevelKeywordDeclaration(augment, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(augment, abstract, null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(augment) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) reportRecoverableError(augment, MixinApplicationClassAugmentation) listener: handleRecoverableError(MixinApplicationClassAugmentation, augment, augment) - listener: beginNamedMixinApplication(augment, abstract, null, null, null, null, null, augment, null, Class) + listener: beginNamedMixinApplication(augment, abstract, null, null, null, null, augment, null, Class) parseNamedMixinApplication(Class, augment, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/parser_testcases/class_modifiers/base/base_class_declaration.dart.expect b/pkg/front_end/parser_testcases/class_modifiers/base/base_class_declaration.dart.expect index 8e0bfea08d9..3ff7faa0973 100644 --- a/pkg/front_end/parser_testcases/class_modifiers/base/base_class_declaration.dart.expect +++ b/pkg/front_end/parser_testcases/class_modifiers/base/base_class_declaration.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(base) beginClassOrMixinOrNamedMixinApplicationPrelude(base) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(base, null, null, null, base, null, null, null, null, A) + beginClassDeclaration(base, null, null, base, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -20,7 +20,7 @@ beginCompilationUnit(base) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, base, null, null, null, null, B) + beginClassDeclaration(abstract, abstract, null, base, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -49,7 +49,7 @@ beginCompilationUnit(base) beginClassOrMixinOrNamedMixinApplicationPrelude(base) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(base, null, null, null, base, null, null, null, null, C) + beginNamedMixinApplication(base, null, null, base, null, null, null, null, C) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) diff --git a/pkg/front_end/parser_testcases/class_modifiers/base/base_class_declaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/class_modifiers/base/base_class_declaration.dart.intertwined.expect index 317a6f12b87..52ee0ac6c65 100644 --- a/pkg/front_end/parser_testcases/class_modifiers/base/base_class_declaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/class_modifiers/base/base_class_declaration.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(base) parseMetadataStar() listener: beginMetadataStar(base) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(base, , class, null, null, base, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(base, null, null, null, base, null, null, null, null, class) + parseTopLevelKeywordDeclaration(base, , class, null, base, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(base, null, null, base, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(base) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(base, null, null, null, base, null, null, null, null, A) + listener: beginClassDeclaration(base, null, null, base, null, null, null, null, A) parseClass(A, base, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,13 +35,13 @@ parseUnit(base) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, }, class, null, null, base, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, base, null, null, null, null, class) + parseTopLevelKeywordDeclaration(abstract, }, class, null, base, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(abstract, abstract, null, base, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, base, null, null, null, null, B) + listener: beginClassDeclaration(abstract, abstract, null, base, null, null, null, null, B) parseClass(B, abstract, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -64,7 +64,7 @@ parseUnit(base) parseMetadataStar(}) listener: beginMetadataStar(base) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(base, }, mixin, null, null, base, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(base, }, mixin, null, base, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(base, null, base, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -87,13 +87,13 @@ parseUnit(base) parseMetadataStar(}) listener: beginMetadataStar(base) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(base, }, class, null, null, base, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(base, null, null, null, base, null, null, null, null, class) + parseTopLevelKeywordDeclaration(base, }, class, null, base, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(base, null, null, base, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(base) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(base, null, null, null, base, null, null, null, null, C) + listener: beginNamedMixinApplication(base, null, null, base, null, null, null, null, C) parseNamedMixinApplication(C, base, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/parser_testcases/class_modifiers/final/final_class_declaration.dart.expect b/pkg/front_end/parser_testcases/class_modifiers/final/final_class_declaration.dart.expect index 0f557b94654..64bdbbeaa21 100644 --- a/pkg/front_end/parser_testcases/class_modifiers/final/final_class_declaration.dart.expect +++ b/pkg/front_end/parser_testcases/class_modifiers/final/final_class_declaration.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(final) beginClassOrMixinOrNamedMixinApplicationPrelude(final) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(final, null, null, null, null, null, final, null, null, A) + beginClassDeclaration(final, null, null, null, null, final, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -20,7 +20,7 @@ beginCompilationUnit(final) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, null, final, null, null, B) + beginClassDeclaration(abstract, abstract, null, null, null, final, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -49,7 +49,7 @@ beginCompilationUnit(final) beginClassOrMixinOrNamedMixinApplicationPrelude(final) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(final, null, null, null, null, null, final, null, null, C) + beginNamedMixinApplication(final, null, null, null, null, final, null, null, C) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) diff --git a/pkg/front_end/parser_testcases/class_modifiers/final/final_class_declaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/class_modifiers/final/final_class_declaration.dart.intertwined.expect index 821f15f2192..19f2add6ddd 100644 --- a/pkg/front_end/parser_testcases/class_modifiers/final/final_class_declaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/class_modifiers/final/final_class_declaration.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(final) parseMetadataStar() listener: beginMetadataStar(final) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(final, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(final, null, null, null, null, null, final, null, null, class) + parseTopLevelKeywordDeclaration(final, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(final, null, null, null, null, final, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(final) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(final, null, null, null, null, null, final, null, null, A) + listener: beginClassDeclaration(final, null, null, null, null, final, null, null, A) parseClass(A, final, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,13 +35,13 @@ parseUnit(final) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, final, null, null, class) + parseTopLevelKeywordDeclaration(abstract, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, final, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, null, final, null, null, B) + listener: beginClassDeclaration(abstract, abstract, null, null, null, final, null, null, B) parseClass(B, abstract, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -64,7 +64,7 @@ parseUnit(final) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -87,13 +87,13 @@ parseUnit(final) parseMetadataStar(}) listener: beginMetadataStar(final) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(final, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(final, null, null, null, null, null, final, null, null, class) + parseTopLevelKeywordDeclaration(final, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(final, null, null, null, null, final, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(final) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(final, null, null, null, null, null, final, null, null, C) + listener: beginNamedMixinApplication(final, null, null, null, null, final, null, null, C) parseNamedMixinApplication(C, final, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/parser_testcases/class_modifiers/interface/interface_class_declaration.dart.expect b/pkg/front_end/parser_testcases/class_modifiers/interface/interface_class_declaration.dart.expect index fe5a4278d41..dd05d2d8188 100644 --- a/pkg/front_end/parser_testcases/class_modifiers/interface/interface_class_declaration.dart.expect +++ b/pkg/front_end/parser_testcases/class_modifiers/interface/interface_class_declaration.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(interface) beginClassOrMixinOrNamedMixinApplicationPrelude(interface) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(interface, null, null, null, null, interface, null, null, null, A) + beginClassDeclaration(interface, null, null, null, interface, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -20,7 +20,7 @@ beginCompilationUnit(interface) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, interface, null, null, null, B) + beginClassDeclaration(abstract, abstract, null, null, interface, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -49,7 +49,7 @@ beginCompilationUnit(interface) beginClassOrMixinOrNamedMixinApplicationPrelude(interface) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(interface, null, null, null, null, interface, null, null, null, C) + beginNamedMixinApplication(interface, null, null, null, interface, null, null, null, C) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) diff --git a/pkg/front_end/parser_testcases/class_modifiers/interface/interface_class_declaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/class_modifiers/interface/interface_class_declaration.dart.intertwined.expect index e040565e4e6..6de9662817b 100644 --- a/pkg/front_end/parser_testcases/class_modifiers/interface/interface_class_declaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/class_modifiers/interface/interface_class_declaration.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(interface) parseMetadataStar() listener: beginMetadataStar(interface) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(interface, , class, null, null, null, interface, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(interface, null, null, null, null, interface, null, null, null, class) + parseTopLevelKeywordDeclaration(interface, , class, null, null, interface, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(interface, null, null, null, interface, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(interface) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(interface, null, null, null, null, interface, null, null, null, A) + listener: beginClassDeclaration(interface, null, null, null, interface, null, null, null, A) parseClass(A, interface, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,13 +35,13 @@ parseUnit(interface) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, }, class, null, null, null, interface, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, interface, null, null, null, class) + parseTopLevelKeywordDeclaration(abstract, }, class, null, null, interface, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, interface, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, interface, null, null, null, B) + listener: beginClassDeclaration(abstract, abstract, null, null, interface, null, null, null, B) parseClass(B, abstract, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -64,7 +64,7 @@ parseUnit(interface) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -87,13 +87,13 @@ parseUnit(interface) parseMetadataStar(}) listener: beginMetadataStar(interface) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(interface, }, class, null, null, null, interface, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(interface, null, null, null, null, interface, null, null, null, class) + parseTopLevelKeywordDeclaration(interface, }, class, null, null, interface, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(interface, null, null, null, interface, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(interface) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(interface, null, null, null, null, interface, null, null, null, C) + listener: beginNamedMixinApplication(interface, null, null, null, interface, null, null, null, C) parseNamedMixinApplication(C, interface, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/parser_testcases/class_modifiers/mixin/mixin_class.dart.expect b/pkg/front_end/parser_testcases/class_modifiers/mixin/mixin_class.dart.expect index 5c8e5fd4968..724be5318ed 100644 --- a/pkg/front_end/parser_testcases/class_modifiers/mixin/mixin_class.dart.expect +++ b/pkg/front_end/parser_testcases/class_modifiers/mixin/mixin_class.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(mixin) beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(mixin, null, null, null, null, null, null, null, mixin, A) + beginClassDeclaration(mixin, null, null, null, null, null, null, mixin, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -20,7 +20,7 @@ beginCompilationUnit(mixin) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, mixin, B) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, mixin, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -49,7 +49,7 @@ beginCompilationUnit(mixin) beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(mixin, null, null, null, null, null, null, null, mixin, C) + beginNamedMixinApplication(mixin, null, null, null, null, null, null, mixin, C) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) diff --git a/pkg/front_end/parser_testcases/class_modifiers/mixin/mixin_class.dart.intertwined.expect b/pkg/front_end/parser_testcases/class_modifiers/mixin/mixin_class.dart.intertwined.expect index 2079a5b98b6..f8209facd13 100644 --- a/pkg/front_end/parser_testcases/class_modifiers/mixin/mixin_class.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/class_modifiers/mixin/mixin_class.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(mixin) parseMetadataStar() listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, , mixin, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(mixin, null, null, null, null, null, null, null, mixin, class) + parseTopLevelKeywordDeclaration(mixin, , mixin, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(mixin, null, null, null, null, null, null, mixin, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(mixin, null, null, null, null, null, null, null, mixin, A) + listener: beginClassDeclaration(mixin, null, null, null, null, null, null, mixin, A) parseClass(A, mixin, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,13 +35,13 @@ parseUnit(mixin) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, mixin, class) + parseTopLevelKeywordDeclaration(abstract, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, mixin, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, mixin, B) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, mixin, B) parseClass(B, abstract, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -64,7 +64,7 @@ parseUnit(mixin) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -87,13 +87,13 @@ parseUnit(mixin) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(mixin, null, null, null, null, null, null, null, mixin, class) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(mixin, null, null, null, null, null, null, mixin, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(mixin, null, null, null, null, null, null, null, mixin, C) + listener: beginNamedMixinApplication(mixin, null, null, null, null, null, null, mixin, C) parseNamedMixinApplication(C, mixin, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.expect b/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.expect index 995cf5d10ef..fa1be620938 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Color, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Color) + beginClassDeclaration(class, null, null, null, null, null, null, null, Color) handleNoPrimaryConstructor(DeclarationKind.Class, Color, null) handleNoType(Color) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.intertwined.expect b/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.intertwined.expect index 9a6ac309dd4..06faefc18e5 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Color, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, Color) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Color) parseClass(Color, class, class, null, Color) parsePrimaryConstructorOpt(DeclarationKind.Class, Color, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Color, null) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.expect b/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.expect index e5d5ea7d312..962909fad00 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Color, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Color) + beginClassDeclaration(class, null, null, null, null, null, null, null, Color) handleNoPrimaryConstructor(DeclarationKind.Class, Color, null) handleNoType(Color) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.intertwined.expect b/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.intertwined.expect index 6212c793df6..0de1ec6186a 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Color, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, Color) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Color) parseClass(Color, class, class, null, Color) parsePrimaryConstructorOpt(DeclarationKind.Class, Color, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Color, null) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/no_identifier_no_context_recovery.dart.intertwined.expect b/pkg/front_end/parser_testcases/dot_shorthands/no_identifier_no_context_recovery.dart.intertwined.expect index e4ef31ae84d..55ae3898dce 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/no_identifier_no_context_recovery.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/no_identifier_no_context_recovery.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/no_identifier_recovery.dart.intertwined.expect b/pkg/front_end/parser_testcases/dot_shorthands/no_identifier_recovery.dart.intertwined.expect index e4ef31ae84d..55ae3898dce 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/no_identifier_recovery.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/no_identifier_recovery.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/syntax.dart.intertwined.expect b/pkg/front_end/parser_testcases/dot_shorthands/syntax.dart.intertwined.expect index 20e10842920..d7db93c0444 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/syntax.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/syntax.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) 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 792753c989a..de6653d73ff 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 1287ee81bf1..38f5f7292cc 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -115,7 +115,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, null, null, D) handleNoPrimaryConstructor(DeclarationKind.Class, D, null) handleNoType(D) handleClassExtends(null, 1) 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 7cf4b522f78..d8a9012322d 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -279,13 +279,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, D) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, D) parseClass(D, class, class, null, D) parsePrimaryConstructorOpt(DeclarationKind.Class, D, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, D, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect index 3720e9578f0..767ca549ed5 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 2d994acc3c8..eb57ad64e5c 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 76fa5c96bc1..ab3a621f566 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 5e3685c28d3..6618a4226d5 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 248dc748a8a..fd961b1d0e2 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 420cc88b54e..7051252f22d 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 0d94547ca19..d2a0e8aa298 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 03b6fe992ae..8024043c789 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 c629e8d113d..76497861a3d 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 6929d8163b5..ff2c71ee15e 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 f35ce539a21..1efbd4c9701 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 f5263e997a3..9b9d83f05fc 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 4eba686dbe1..d2ecd284ba8 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 8cc1dceb674..ac24174d28f 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 3a87998d444..ba7dd3e6659 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 2301a0fb9f3..f358f30d7f8 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 57b3a05a647..354bd464b70 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 ffe0cbfa20d..56f1bc82e92 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 888347522e7..c3ff2f35018 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, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) diff --git a/pkg/front_end/parser_testcases/error_recovery/invalid_enum_modifiers.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/invalid_enum_modifiers.dart.intertwined.expect index 3e179bfa09d..da10b8371bd 100644 --- a/pkg/front_end/parser_testcases/error_recovery/invalid_enum_modifiers.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/invalid_enum_modifiers.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(base) parseMetadataStar() listener: beginMetadataStar(base) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(base, , enum, null, null, base, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(base, , enum, null, base, null, DirectiveContext(DirectiveState.Unknown)) reportRecoverableError(base, BaseEnum) listener: handleRecoverableError(BaseEnum, base, base) parseEnum(base, null, enum) @@ -45,7 +45,7 @@ parseUnit(base) parseMetadataStar(}) listener: beginMetadataStar(final) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(final, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(final, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) reportRecoverableError(final, FinalEnum) listener: handleRecoverableError(FinalEnum, final, final) parseEnum(final, null, enum) @@ -84,7 +84,7 @@ parseUnit(base) parseMetadataStar(}) listener: beginMetadataStar(interface) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(interface, }, enum, null, null, null, interface, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(interface, }, enum, null, null, interface, DirectiveContext(DirectiveState.Declarations)) reportRecoverableError(interface, InterfaceEnum) listener: handleRecoverableError(InterfaceEnum, interface, interface) parseEnum(interface, null, enum) @@ -123,7 +123,7 @@ parseUnit(base) parseMetadataStar(}) listener: beginMetadataStar(sealed) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(sealed, }, enum, null, sealed, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(sealed, }, enum, sealed, null, null, DirectiveContext(DirectiveState.Declarations)) reportRecoverableError(sealed, SealedEnum) listener: handleRecoverableError(SealedEnum, sealed, sealed) parseEnum(sealed, null, enum) 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 6343c579f96..ac4deb4028c 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 580bf296123..439645ac70b 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 0a2ae4683f0..627f5c5c7a1 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -42,7 +42,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -58,7 +58,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleIdentifier(A, typeReference) handleNoTypeArguments(,) @@ -95,7 +95,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables(extend) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) handleNoType(Bar) handleClassExtends(null, 1) @@ -138,7 +138,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Baz, classOrMixinDeclaration) handleNoTypeVariables(on) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Baz) + beginClassDeclaration(class, null, null, null, null, null, null, null, Baz) handleNoPrimaryConstructor(DeclarationKind.Class, Baz, null) handleNoType(Baz) handleClassExtends(null, 1) 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 9623c5743de..606e08d93c2 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,13 +35,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -64,13 +64,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) @@ -133,13 +133,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, null, Bar) parsePrimaryConstructorOpt(DeclarationKind.Class, Bar, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) @@ -219,13 +219,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Baz) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Baz) parseClass(Baz, class, class, null, Baz) parsePrimaryConstructorOpt(DeclarationKind.Class, Baz, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Baz, null) 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 4d77306bbf4..1be29648fdf 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, null, null, null, null, Annotation) + beginClassDeclaration(class, null, null, null, null, null, null, null, Annotation) handleNoPrimaryConstructor(DeclarationKind.Class, Annotation, null) handleNoType(Annotation) handleClassExtends(null, 1) @@ -81,7 +81,7 @@ beginCompilationUnit(const) handleNoType(E) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -97,7 +97,7 @@ beginCompilationUnit(const) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 6d79133a3f3..1ee4516e9cb 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 @@ -30,13 +30,13 @@ parseUnit(const) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Annotation) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Annotation) parseClass(Annotation, class, class, null, Annotation) parsePrimaryConstructorOpt(DeclarationKind.Class, Annotation, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Annotation, null) @@ -117,8 +117,8 @@ parseUnit(const) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) @@ -131,7 +131,7 @@ parseUnit(const) listener: handleNoType(E) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(>, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -154,13 +154,13 @@ parseUnit(const) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 3664951ce7e..69d94539409 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, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -43,7 +43,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -77,7 +77,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -117,7 +117,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -147,7 +147,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -191,7 +191,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -236,7 +236,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -292,7 +292,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -371,7 +371,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -442,7 +442,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -459,7 +459,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, 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 d253b2e1127..5dc26ac259b 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, null, null, null, null, Key) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Key) handleNoPrimaryConstructor(DeclarationKind.Class, Key, null) handleNoType(Key) handleClassExtends(null, 1) 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 27ad19c55a6..b230678fdf3 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(abstract, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(abstract, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Key, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, null, Key) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Key) parseClass(Key, abstract, class, null, Key) parsePrimaryConstructorOpt(DeclarationKind.Class, Key, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Key, null) 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 11b515393b5..7ef844690f3 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, null, null, null, null, Key) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Key) handleNoPrimaryConstructor(DeclarationKind.Class, Key, null) handleNoType(Key) handleClassExtends(null, 1) 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 ad65591bc3d..d831a6e5c36 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(abstract, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(abstract, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Key, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, null, Key) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Key) parseClass(Key, abstract, class, null, Key) parsePrimaryConstructorOpt(DeclarationKind.Class, Key, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Key, null) 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 e4ba883df58..c9b9436f20f 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, null, null, null, null, Key) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Key) handleNoPrimaryConstructor(DeclarationKind.Class, Key, null) handleNoType(Key) handleClassExtends(null, 1) 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 63f8e6f2aa8..07b2cbe611e 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(abstract, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(abstract, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Key, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, null, Key) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Key) parseClass(Key, abstract, class, null, Key) parsePrimaryConstructorOpt(DeclarationKind.Class, Key, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Key, null) 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 9ed0899b7ab..592a59c7a7c 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 527982c24b2..b14b4331ee6 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect index c8372416b7c..941e537175d 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 a6ae0710fda..220e0fa1056 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) 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 4d65ca9e061..932b77e9889 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, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, 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 12c022fad86..e6280660740 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 9b23fc6a4bd..95512d45987 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 53ad82a1bc5..03412814e26 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -55,7 +55,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(DND1, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, DND1) + beginClassDeclaration(class, null, null, null, null, null, null, null, DND1) handleNoPrimaryConstructor(DeclarationKind.Class, DND1, null) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) 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 5a1b16905e3..835e9c66746 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(>, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -43,7 +43,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -74,13 +74,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, DND1) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, DND1) parseClass(DND1, class, class, null, DND1) parsePrimaryConstructorOpt(DeclarationKind.Class, DND1, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, DND1, null) 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 eb2ce1a385d..fe95c305ba5 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, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, 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 ca634e953a2..8a3ab42cad8 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, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, 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 a229bb111bc..86da27b8078 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, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, 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 2af32da3ebf..8d3c28f223f 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, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, null, null, F) handleNoPrimaryConstructor(DeclarationKind.Class, F, null) handleNoType(F) handleClassExtends(null, 1) 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 d37134b5276..4428f5b14d6 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, F) parseClass(F, class, class, null, F) parsePrimaryConstructorOpt(DeclarationKind.Class, F, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, F, null) 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 19370302434..be8cf451f22 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, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, null, null, F) handleNoPrimaryConstructor(DeclarationKind.Class, F, null) handleNoType(F) handleClassExtends(null, 1) 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 1cd6b7d92a4..5592941d66b 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, F) parseClass(F, class, class, null, F) parsePrimaryConstructorOpt(DeclarationKind.Class, F, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, F, null) 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 d72e10ef7a3..797a64b2ec0 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, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, null, null, F) handleNoPrimaryConstructor(DeclarationKind.Class, F, null) handleNoType(F) handleClassExtends(null, 1) 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 f81d30da3f1..3d01d61e74e 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, F) parseClass(F, class, class, null, F) parsePrimaryConstructorOpt(DeclarationKind.Class, F, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, F, null) 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 90eabdd8007..c3b66482105 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, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, null, null, F) handleNoPrimaryConstructor(DeclarationKind.Class, F, null) handleNoType(F) handleClassExtends(null, 1) 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 87b487a69b7..eba251b1d77 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, F) parseClass(F, class, class, null, F) parsePrimaryConstructorOpt(DeclarationKind.Class, F, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, F, null) 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 a679306c271..dcd63ad1890 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, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, null, null, F) handleNoPrimaryConstructor(DeclarationKind.Class, F, null) handleNoType(F) handleClassExtends(null, 1) 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 cddab179ec3..cbeaca7f63b 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, F) parseClass(F, class, class, null, F) parsePrimaryConstructorOpt(DeclarationKind.Class, F, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, F, null) 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 c48e6dd3d9c..e802b3514f6 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, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, null, null, F) handleNoPrimaryConstructor(DeclarationKind.Class, F, null) handleNoType(F) handleClassExtends(null, 1) 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 2e951ae3e86..bcb7c88e46b 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, F) parseClass(F, class, class, null, F) parsePrimaryConstructorOpt(DeclarationKind.Class, F, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, F, null) 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 4eb70d31565..36f0ab75a8c 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, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, null, null, F) handleNoPrimaryConstructor(DeclarationKind.Class, F, null) handleNoType(F) handleClassExtends(null, 1) 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 f38ad811850..1f602b02de1 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, F) parseClass(F, class, class, null, F) parsePrimaryConstructorOpt(DeclarationKind.Class, F, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, F, null) 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 0e87b182d9d..4234b6e1cd5 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, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, null, null, F) handleNoPrimaryConstructor(DeclarationKind.Class, F, null) handleNoType(F) handleClassExtends(null, 1) 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 10b11e284fc..57dabae2cb0 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, F) parseClass(F, class, class, null, F) parsePrimaryConstructorOpt(DeclarationKind.Class, F, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, F, null) 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 80f248e1fee..7ca009aaf17 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, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, null, null, F) handleNoPrimaryConstructor(DeclarationKind.Class, F, null) handleNoType(F) handleClassExtends(null, 1) 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 7503643edc5..7a46bd1b14d 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, F) parseClass(F, class, class, null, F) parsePrimaryConstructorOpt(DeclarationKind.Class, F, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, F, null) 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 d91d205637d..f9fd077d48c 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) 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 263f04e78af..6cdd37e6fcd 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(class, UnmatchedToken((), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken((), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(>, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45662.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45662.crash_dart.expect index 746f9a660fe..050f6e18123 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45662.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45662.crash_dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45662.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45662.crash_dart.intertwined.expect index dfbb74303a1..f4e116b6ca7 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45662.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45662.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt.crash_dart.expect index ccdc44090d9..e001d14aefd 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt.crash_dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt.crash_dart.intertwined.expect index fb77bcb9b9a..40455061f5e 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt_prime.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt_prime.crash_dart.expect index 0e2e86a9118..7f659ec8334 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt_prime.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt_prime.crash_dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt_prime.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt_prime.crash_dart.intertwined.expect index f354e47de35..285f5ed980b 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt_prime.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45662_gt_gt_prime.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45662_prime.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45662_prime.crash_dart.expect index a9e60e588d2..6ef4d96b0af 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45662_prime.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45662_prime.crash_dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45662_prime.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45662_prime.crash_dart.intertwined.expect index fcb7dc4b2ba..c0c74d5d368 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45662_prime.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45662_prime.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) 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 d5a2bf6a1f9..2062f51e382 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 @@ -235,7 +235,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'abstract' as a name here., null, {lexeme: abstract}], abstract, abstract) handleIdentifier(abstract, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, abstract) + beginClassDeclaration(class, null, null, null, null, null, null, null, abstract) handleNoPrimaryConstructor(DeclarationKind.Class, abstract, null) handleNoType(abstract) handleClassExtends(null, 1) @@ -252,7 +252,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'as' as a name here., null, {lexeme: as}], as, as) handleIdentifier(as, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, as) + beginClassDeclaration(class, null, null, null, null, null, null, null, as) handleNoPrimaryConstructor(DeclarationKind.Class, as, null) handleNoType(as) handleClassExtends(null, 1) @@ -269,7 +269,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, assert) + beginClassDeclaration(class, null, null, null, null, null, null, null, assert) handleNoPrimaryConstructor(DeclarationKind.Class, assert, null) handleNoType(assert) handleClassExtends(null, 1) @@ -285,7 +285,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(async, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, async) + beginClassDeclaration(class, null, null, null, null, null, null, null, async) handleNoPrimaryConstructor(DeclarationKind.Class, async, null) handleNoType(async) handleClassExtends(null, 1) @@ -301,7 +301,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(await, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, await) + beginClassDeclaration(class, null, null, null, null, null, null, null, await) handleNoPrimaryConstructor(DeclarationKind.Class, await, null) handleNoType(await) handleClassExtends(null, 1) @@ -318,7 +318,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, break) + beginClassDeclaration(class, null, null, null, null, null, null, null, break) handleNoPrimaryConstructor(DeclarationKind.Class, break, null) handleNoType(break) handleClassExtends(null, 1) @@ -335,7 +335,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, case) + beginClassDeclaration(class, null, null, null, null, null, null, null, case) handleNoPrimaryConstructor(DeclarationKind.Class, case, null) handleNoType(case) handleClassExtends(null, 1) @@ -352,7 +352,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, catch) + beginClassDeclaration(class, null, null, null, null, null, null, null, catch) handleNoPrimaryConstructor(DeclarationKind.Class, catch, null) handleNoType(catch) handleClassExtends(null, 1) @@ -369,7 +369,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, class) + beginClassDeclaration(class, null, null, null, null, null, null, null, class) handleNoPrimaryConstructor(DeclarationKind.Class, class, null) handleNoType(class) handleClassExtends(null, 1) @@ -386,7 +386,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(ExpectedIdentifier), Expected an identifier, but got '{'., Try inserting an identifier before '{'., {lexeme: {}], {, {) handleIdentifier(, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, ) + beginClassDeclaration(class, null, null, null, null, null, null, null, ) handleRecoverableError(ConstWithoutPrimaryConstructor, const, const) handleNoPrimaryConstructor(DeclarationKind.Class, , const) handleNoType() @@ -404,7 +404,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, continue) + beginClassDeclaration(class, null, null, null, null, null, null, null, continue) handleNoPrimaryConstructor(DeclarationKind.Class, continue, null) handleNoType(continue) handleClassExtends(null, 1) @@ -421,7 +421,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'covariant' as a name here., null, {lexeme: covariant}], covariant, covariant) handleIdentifier(covariant, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, covariant) + beginClassDeclaration(class, null, null, null, null, null, null, null, covariant) handleNoPrimaryConstructor(DeclarationKind.Class, covariant, null) handleNoType(covariant) handleClassExtends(null, 1) @@ -438,7 +438,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, default) + beginClassDeclaration(class, null, null, null, null, null, null, null, default) handleNoPrimaryConstructor(DeclarationKind.Class, default, null) handleNoType(default) handleClassExtends(null, 1) @@ -455,7 +455,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'deferred' as a name here., null, {lexeme: deferred}], deferred, deferred) handleIdentifier(deferred, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, deferred) + beginClassDeclaration(class, null, null, null, null, null, null, null, deferred) handleNoPrimaryConstructor(DeclarationKind.Class, deferred, null) handleNoType(deferred) handleClassExtends(null, 1) @@ -472,7 +472,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, do) + beginClassDeclaration(class, null, null, null, null, null, null, null, do) handleNoPrimaryConstructor(DeclarationKind.Class, do, null) handleNoType(do) handleClassExtends(null, 1) @@ -489,7 +489,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'dynamic' as a name here., null, {lexeme: dynamic}], dynamic, dynamic) handleIdentifier(dynamic, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, dynamic) + beginClassDeclaration(class, null, null, null, null, null, null, null, dynamic) handleNoPrimaryConstructor(DeclarationKind.Class, dynamic, null) handleNoType(dynamic) handleClassExtends(null, 1) @@ -506,7 +506,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, else) + beginClassDeclaration(class, null, null, null, null, null, null, null, else) handleNoPrimaryConstructor(DeclarationKind.Class, else, null) handleNoType(else) handleClassExtends(null, 1) @@ -523,7 +523,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, enum) + beginClassDeclaration(class, null, null, null, null, null, null, null, enum) handleNoPrimaryConstructor(DeclarationKind.Class, enum, null) handleNoType(enum) handleClassExtends(null, 1) @@ -540,7 +540,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'export' as a name here., null, {lexeme: export}], export, export) handleIdentifier(export, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, export) + beginClassDeclaration(class, null, null, null, null, null, null, null, export) handleNoPrimaryConstructor(DeclarationKind.Class, export, null) handleNoType(export) handleClassExtends(null, 1) @@ -557,7 +557,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, extends) + beginClassDeclaration(class, null, null, null, null, null, null, null, extends) handleNoPrimaryConstructor(DeclarationKind.Class, extends, null) handleNoType(extends) handleClassExtends(null, 1) @@ -574,7 +574,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'extension' as a name here., null, {lexeme: extension}], extension, extension) handleIdentifier(extension, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, extension) + beginClassDeclaration(class, null, null, null, null, null, null, null, extension) handleNoPrimaryConstructor(DeclarationKind.Class, extension, null) handleNoType(extension) handleClassExtends(null, 1) @@ -591,7 +591,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'external' as a name here., null, {lexeme: external}], external, external) handleIdentifier(external, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, external) + beginClassDeclaration(class, null, null, null, null, null, null, null, external) handleNoPrimaryConstructor(DeclarationKind.Class, external, null) handleNoType(external) handleClassExtends(null, 1) @@ -608,7 +608,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'factory' as a name here., null, {lexeme: factory}], factory, factory) handleIdentifier(factory, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, factory) + beginClassDeclaration(class, null, null, null, null, null, null, null, factory) handleNoPrimaryConstructor(DeclarationKind.Class, factory, null) handleNoType(factory) handleClassExtends(null, 1) @@ -625,7 +625,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, false) + beginClassDeclaration(class, null, null, null, null, null, null, null, false) handleNoPrimaryConstructor(DeclarationKind.Class, false, null) handleNoType(false) handleClassExtends(null, 1) @@ -642,7 +642,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, final) + beginClassDeclaration(class, null, null, null, null, null, null, null, final) handleNoPrimaryConstructor(DeclarationKind.Class, final, null) handleNoType(final) handleClassExtends(null, 1) @@ -659,7 +659,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, finally) + beginClassDeclaration(class, null, null, null, null, null, null, null, finally) handleNoPrimaryConstructor(DeclarationKind.Class, finally, null) handleNoType(finally) handleClassExtends(null, 1) @@ -676,7 +676,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, for) + beginClassDeclaration(class, null, null, null, null, null, null, null, for) handleNoPrimaryConstructor(DeclarationKind.Class, for, null) handleNoType(for) handleClassExtends(null, 1) @@ -693,7 +693,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) handleIdentifier(Function, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Function) + beginClassDeclaration(class, null, null, null, null, null, null, null, Function) handleNoPrimaryConstructor(DeclarationKind.Class, Function, null) handleNoType(Function) handleClassExtends(null, 1) @@ -710,7 +710,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'get' as a name here., null, {lexeme: get}], get, get) handleIdentifier(get, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, get) + beginClassDeclaration(class, null, null, null, null, null, null, null, get) handleNoPrimaryConstructor(DeclarationKind.Class, get, null) handleNoType(get) handleClassExtends(null, 1) @@ -726,7 +726,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(hide, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, hide) + beginClassDeclaration(class, null, null, null, null, null, null, null, hide) handleNoPrimaryConstructor(DeclarationKind.Class, hide, null) handleNoType(hide) handleClassExtends(null, 1) @@ -743,7 +743,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, if) + beginClassDeclaration(class, null, null, null, null, null, null, null, if) handleNoPrimaryConstructor(DeclarationKind.Class, if, null) handleNoType(if) handleClassExtends(null, 1) @@ -760,7 +760,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'implements' as a name here., null, {lexeme: implements}], implements, implements) handleIdentifier(implements, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, implements) + beginClassDeclaration(class, null, null, null, null, null, null, null, implements) handleNoPrimaryConstructor(DeclarationKind.Class, implements, null) handleNoType(implements) handleClassExtends(null, 1) @@ -777,7 +777,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'import' as a name here., null, {lexeme: import}], import, import) handleIdentifier(import, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, import) + beginClassDeclaration(class, null, null, null, null, null, null, null, import) handleNoPrimaryConstructor(DeclarationKind.Class, import, null) handleNoType(import) handleClassExtends(null, 1) @@ -794,7 +794,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, in) + beginClassDeclaration(class, null, null, null, null, null, null, null, in) handleNoPrimaryConstructor(DeclarationKind.Class, in, null) handleNoType(in) handleClassExtends(null, 1) @@ -810,7 +810,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(inout, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, inout) + beginClassDeclaration(class, null, null, null, null, null, null, null, inout) handleNoPrimaryConstructor(DeclarationKind.Class, inout, null) handleNoType(inout) handleClassExtends(null, 1) @@ -827,7 +827,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'interface' as a name here., null, {lexeme: interface}], interface, interface) handleIdentifier(interface, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, interface) + beginClassDeclaration(class, null, null, null, null, null, null, null, interface) handleNoPrimaryConstructor(DeclarationKind.Class, interface, null) handleNoType(interface) handleClassExtends(null, 1) @@ -844,7 +844,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, is) + beginClassDeclaration(class, null, null, null, null, null, null, null, is) handleNoPrimaryConstructor(DeclarationKind.Class, is, null) handleNoType(is) handleClassExtends(null, 1) @@ -861,7 +861,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'late' as a name here., null, {lexeme: late}], late, late) handleIdentifier(late, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, late) + beginClassDeclaration(class, null, null, null, null, null, null, null, late) handleNoPrimaryConstructor(DeclarationKind.Class, late, null) handleNoType(late) handleClassExtends(null, 1) @@ -878,7 +878,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'library' as a name here., null, {lexeme: library}], library, library) handleIdentifier(library, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, library) + beginClassDeclaration(class, null, null, null, null, null, null, null, library) handleNoPrimaryConstructor(DeclarationKind.Class, library, null) handleNoType(library) handleClassExtends(null, 1) @@ -895,7 +895,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'mixin' as a name here., null, {lexeme: mixin}], mixin, mixin) handleIdentifier(mixin, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, mixin) + beginClassDeclaration(class, null, null, null, null, null, null, null, mixin) handleNoPrimaryConstructor(DeclarationKind.Class, mixin, null) handleNoType(mixin) handleClassExtends(null, 1) @@ -911,7 +911,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(native, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, native) + beginClassDeclaration(class, null, null, null, null, null, null, null, native) handleNoPrimaryConstructor(DeclarationKind.Class, native, null) handleNoType(native) handleClassExtends(null, 1) @@ -928,7 +928,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, new) + beginClassDeclaration(class, null, null, null, null, null, null, null, new) handleNoPrimaryConstructor(DeclarationKind.Class, new, null) handleNoType(new) handleClassExtends(null, 1) @@ -945,7 +945,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null) + beginClassDeclaration(class, null, null, null, null, null, null, null, null) handleNoPrimaryConstructor(DeclarationKind.Class, null, null) handleNoType(null) handleClassExtends(null, 1) @@ -961,7 +961,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(of, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, of) + beginClassDeclaration(class, null, null, null, null, null, null, null, of) handleNoPrimaryConstructor(DeclarationKind.Class, of, null) handleNoType(of) handleClassExtends(null, 1) @@ -977,7 +977,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(on, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, on) + beginClassDeclaration(class, null, null, null, null, null, null, null, on) handleNoPrimaryConstructor(DeclarationKind.Class, on, null) handleNoType(on) handleClassExtends(null, 1) @@ -994,7 +994,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) handleIdentifier(operator, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, operator) + beginClassDeclaration(class, null, null, null, null, null, null, null, operator) handleNoPrimaryConstructor(DeclarationKind.Class, operator, null) handleNoType(operator) handleClassExtends(null, 1) @@ -1010,7 +1010,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(out, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, out) + beginClassDeclaration(class, null, null, null, null, null, null, null, out) handleNoPrimaryConstructor(DeclarationKind.Class, out, null) handleNoType(out) handleClassExtends(null, 1) @@ -1027,7 +1027,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'part' as a name here., null, {lexeme: part}], part, part) handleIdentifier(part, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, part) + beginClassDeclaration(class, null, null, null, null, null, null, null, part) handleNoPrimaryConstructor(DeclarationKind.Class, part, null) handleNoType(part) handleClassExtends(null, 1) @@ -1043,7 +1043,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(patch, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, patch) + beginClassDeclaration(class, null, null, null, null, null, null, null, patch) handleNoPrimaryConstructor(DeclarationKind.Class, patch, null) handleNoType(patch) handleClassExtends(null, 1) @@ -1060,7 +1060,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'required' as a name here., null, {lexeme: required}], required, required) handleIdentifier(required, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, required) + beginClassDeclaration(class, null, null, null, null, null, null, null, required) handleNoPrimaryConstructor(DeclarationKind.Class, required, null) handleNoType(required) handleClassExtends(null, 1) @@ -1077,7 +1077,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, rethrow) + beginClassDeclaration(class, null, null, null, null, null, null, null, rethrow) handleNoPrimaryConstructor(DeclarationKind.Class, rethrow, null) handleNoType(rethrow) handleClassExtends(null, 1) @@ -1094,7 +1094,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, return) + beginClassDeclaration(class, null, null, null, null, null, null, null, return) handleNoPrimaryConstructor(DeclarationKind.Class, return, null) handleNoType(return) handleClassExtends(null, 1) @@ -1111,7 +1111,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'set' as a name here., null, {lexeme: set}], set, set) handleIdentifier(set, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, set) + beginClassDeclaration(class, null, null, null, null, null, null, null, set) handleNoPrimaryConstructor(DeclarationKind.Class, set, null) handleNoType(set) handleClassExtends(null, 1) @@ -1127,7 +1127,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(show, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, show) + beginClassDeclaration(class, null, null, null, null, null, null, null, show) handleNoPrimaryConstructor(DeclarationKind.Class, show, null) handleNoType(show) handleClassExtends(null, 1) @@ -1143,7 +1143,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(source, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, source) + beginClassDeclaration(class, null, null, null, null, null, null, null, source) handleNoPrimaryConstructor(DeclarationKind.Class, source, null) handleNoType(source) handleClassExtends(null, 1) @@ -1160,7 +1160,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'static' as a name here., null, {lexeme: static}], static, static) handleIdentifier(static, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, static) + beginClassDeclaration(class, null, null, null, null, null, null, null, static) handleNoPrimaryConstructor(DeclarationKind.Class, static, null) handleNoType(static) handleClassExtends(null, 1) @@ -1177,7 +1177,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, super) + beginClassDeclaration(class, null, null, null, null, null, null, null, super) handleNoPrimaryConstructor(DeclarationKind.Class, super, null) handleNoType(super) handleClassExtends(null, 1) @@ -1194,7 +1194,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, switch) + beginClassDeclaration(class, null, null, null, null, null, null, null, switch) handleNoPrimaryConstructor(DeclarationKind.Class, switch, null) handleNoType(switch) handleClassExtends(null, 1) @@ -1210,7 +1210,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(sync, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, sync) + beginClassDeclaration(class, null, null, null, null, null, null, null, sync) handleNoPrimaryConstructor(DeclarationKind.Class, sync, null) handleNoType(sync) handleClassExtends(null, 1) @@ -1227,7 +1227,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) handleIdentifier(this, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, this) + beginClassDeclaration(class, null, null, null, null, null, null, null, this) handleNoPrimaryConstructor(DeclarationKind.Class, this, null) handleNoType(this) handleClassExtends(null, 1) @@ -1244,7 +1244,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, throw) + beginClassDeclaration(class, null, null, null, null, null, null, null, throw) handleNoPrimaryConstructor(DeclarationKind.Class, throw, null) handleNoType(throw) handleClassExtends(null, 1) @@ -1261,7 +1261,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, true) + beginClassDeclaration(class, null, null, null, null, null, null, null, true) handleNoPrimaryConstructor(DeclarationKind.Class, true, null) handleNoType(true) handleClassExtends(null, 1) @@ -1278,7 +1278,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, try) + beginClassDeclaration(class, null, null, null, null, null, null, null, try) handleNoPrimaryConstructor(DeclarationKind.Class, try, null) handleNoType(try) handleClassExtends(null, 1) @@ -1295,7 +1295,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'typedef' as a name here., null, {lexeme: typedef}], typedef, typedef) handleIdentifier(typedef, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, typedef) + beginClassDeclaration(class, null, null, null, null, null, null, null, typedef) handleNoPrimaryConstructor(DeclarationKind.Class, typedef, null) handleNoType(typedef) handleClassExtends(null, 1) @@ -1312,7 +1312,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, var) + beginClassDeclaration(class, null, null, null, null, null, null, null, var) handleNoPrimaryConstructor(DeclarationKind.Class, var, null) handleNoType(var) handleClassExtends(null, 1) @@ -1329,7 +1329,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, void) + beginClassDeclaration(class, null, null, null, null, null, null, null, void) handleNoPrimaryConstructor(DeclarationKind.Class, void, null) handleNoType(void) handleClassExtends(null, 1) @@ -1346,7 +1346,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, while) + beginClassDeclaration(class, null, null, null, null, null, null, null, while) handleNoPrimaryConstructor(DeclarationKind.Class, while, null) handleNoType(while) handleClassExtends(null, 1) @@ -1363,7 +1363,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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, null, null, null, null, with) + beginClassDeclaration(class, null, null, null, null, null, null, null, with) handleNoPrimaryConstructor(DeclarationKind.Class, with, null) handleNoType(with) handleClassExtends(null, 1) @@ -1379,7 +1379,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(yield, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, yield) + beginClassDeclaration(class, null, null, null, null, null, null, null, yield) handleNoPrimaryConstructor(DeclarationKind.Class, yield, null) handleNoType(yield) handleClassExtends(null, 1) 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 5fc01c49f3a..6f8a38aa1b7 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(abstract, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, abstract) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, abstract) parseClass(abstract, class, class, null, abstract) parsePrimaryConstructorOpt(DeclarationKind.Class, abstract, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, abstract, null) @@ -37,15 +37,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(as, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, as) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, as) parseClass(as, class, class, null, as) parsePrimaryConstructorOpt(DeclarationKind.Class, as, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, as, null) @@ -68,15 +68,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(assert, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, assert) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, assert) parseClass(assert, class, class, null, assert) parsePrimaryConstructorOpt(DeclarationKind.Class, assert, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, assert, null) @@ -99,13 +99,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, async) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, async) parseClass(async, class, class, null, async) parsePrimaryConstructorOpt(DeclarationKind.Class, async, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, async, null) @@ -128,13 +128,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, await) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, await) parseClass(await, class, class, null, await) parsePrimaryConstructorOpt(DeclarationKind.Class, await, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, await, null) @@ -157,15 +157,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(break, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, break) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, break) parseClass(break, class, class, null, break) parsePrimaryConstructorOpt(DeclarationKind.Class, break, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, break, null) @@ -188,15 +188,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(case, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, case) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, case) parseClass(case, class, class, null, case) parsePrimaryConstructorOpt(DeclarationKind.Class, case, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, case, null) @@ -219,15 +219,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(catch, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, catch) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, catch) parseClass(catch, class, class, null, catch) parsePrimaryConstructorOpt(DeclarationKind.Class, catch, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, catch, null) @@ -250,15 +250,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(class, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, class) parseClass(class, class, class, null, class) parsePrimaryConstructorOpt(DeclarationKind.Class, class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, class, null) @@ -281,8 +281,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) insertSyntheticIdentifier(const, classOrMixinDeclaration, message: Message[Template(ExpectedIdentifier), Expected an identifier, but got '{'., Try inserting an identifier before '{'., {lexeme: {}], messageOnToken: null) @@ -291,7 +291,7 @@ parseUnit(class) rewriter() listener: handleIdentifier(, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, ) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, ) parseClass(, class, class, const, ) parsePrimaryConstructorOpt(DeclarationKind.Class, , const) reportRecoverableError(const, ConstWithoutPrimaryConstructor) @@ -316,15 +316,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(continue, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, continue) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, continue) parseClass(continue, class, class, null, continue) parsePrimaryConstructorOpt(DeclarationKind.Class, continue, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, continue, null) @@ -347,15 +347,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(covariant, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, covariant) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, covariant) parseClass(covariant, class, class, null, covariant) parsePrimaryConstructorOpt(DeclarationKind.Class, covariant, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, covariant, null) @@ -378,15 +378,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(default, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, default) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, default) parseClass(default, class, class, null, default) parsePrimaryConstructorOpt(DeclarationKind.Class, default, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, default, null) @@ -409,15 +409,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(deferred, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, deferred) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, deferred) parseClass(deferred, class, class, null, deferred) parsePrimaryConstructorOpt(DeclarationKind.Class, deferred, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, deferred, null) @@ -440,15 +440,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(do, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, do) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, do) parseClass(do, class, class, null, do) parsePrimaryConstructorOpt(DeclarationKind.Class, do, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, do, null) @@ -471,15 +471,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(dynamic, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, dynamic) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, dynamic) parseClass(dynamic, class, class, null, dynamic) parsePrimaryConstructorOpt(DeclarationKind.Class, dynamic, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, dynamic, null) @@ -502,15 +502,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(else, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, else) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, else) parseClass(else, class, class, null, else) parsePrimaryConstructorOpt(DeclarationKind.Class, else, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, else, null) @@ -533,15 +533,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(enum, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, enum) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, enum) parseClass(enum, class, class, null, enum) parsePrimaryConstructorOpt(DeclarationKind.Class, enum, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, enum, null) @@ -564,15 +564,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(export, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, export) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, export) parseClass(export, class, class, null, export) parsePrimaryConstructorOpt(DeclarationKind.Class, export, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, export, null) @@ -595,15 +595,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extends, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, extends) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, extends) parseClass(extends, class, class, null, extends) parsePrimaryConstructorOpt(DeclarationKind.Class, extends, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, extends, null) @@ -626,15 +626,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extension, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, extension) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, extension) parseClass(extension, class, class, null, extension) parsePrimaryConstructorOpt(DeclarationKind.Class, extension, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, extension, null) @@ -657,15 +657,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(external, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, external) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, external) parseClass(external, class, class, null, external) parsePrimaryConstructorOpt(DeclarationKind.Class, external, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, external, null) @@ -688,15 +688,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(factory, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, factory) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, factory) parseClass(factory, class, class, null, factory) parsePrimaryConstructorOpt(DeclarationKind.Class, factory, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, factory, null) @@ -719,15 +719,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(false, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, false) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, false) parseClass(false, class, class, null, false) parsePrimaryConstructorOpt(DeclarationKind.Class, false, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, false, null) @@ -750,15 +750,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(final, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, final) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, final) parseClass(final, class, class, null, final) parsePrimaryConstructorOpt(DeclarationKind.Class, final, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, final, null) @@ -781,15 +781,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(finally, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, finally) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, finally) parseClass(finally, class, class, null, finally) parsePrimaryConstructorOpt(DeclarationKind.Class, finally, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, finally, null) @@ -812,15 +812,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(for, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, for) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, for) parseClass(for, class, class, null, for) parsePrimaryConstructorOpt(DeclarationKind.Class, for, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, for, null) @@ -843,15 +843,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(Function, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, Function) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Function) parseClass(Function, class, class, null, Function) parsePrimaryConstructorOpt(DeclarationKind.Class, Function, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Function, null) @@ -874,15 +874,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(get, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, get) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, get) parseClass(get, class, class, null, get) parsePrimaryConstructorOpt(DeclarationKind.Class, get, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, get, null) @@ -905,13 +905,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, hide) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, hide) parseClass(hide, class, class, null, hide) parsePrimaryConstructorOpt(DeclarationKind.Class, hide, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, hide, null) @@ -934,15 +934,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(if, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, if) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, if) parseClass(if, class, class, null, if) parsePrimaryConstructorOpt(DeclarationKind.Class, if, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, if, null) @@ -965,15 +965,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(implements, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, implements) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, implements) parseClass(implements, class, class, null, implements) parsePrimaryConstructorOpt(DeclarationKind.Class, implements, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, implements, null) @@ -996,15 +996,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(import, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, import) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, import) parseClass(import, class, class, null, import) parsePrimaryConstructorOpt(DeclarationKind.Class, import, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, import, null) @@ -1027,15 +1027,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(in, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, in) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, in) parseClass(in, class, class, null, in) parsePrimaryConstructorOpt(DeclarationKind.Class, in, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, in, null) @@ -1058,13 +1058,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, inout) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, inout) parseClass(inout, class, class, null, inout) parsePrimaryConstructorOpt(DeclarationKind.Class, inout, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, inout, null) @@ -1087,15 +1087,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(interface, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, interface) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, interface) parseClass(interface, class, class, null, interface) parsePrimaryConstructorOpt(DeclarationKind.Class, interface, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, interface, null) @@ -1118,15 +1118,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(is, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, is) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, is) parseClass(is, class, class, null, is) parsePrimaryConstructorOpt(DeclarationKind.Class, is, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, is, null) @@ -1149,15 +1149,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(late, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, late) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, late) parseClass(late, class, class, null, late) parsePrimaryConstructorOpt(DeclarationKind.Class, late, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, late, null) @@ -1180,15 +1180,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(library, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, library) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, library) parseClass(library, class, class, null, library) parsePrimaryConstructorOpt(DeclarationKind.Class, library, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, library, null) @@ -1211,15 +1211,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(mixin, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, mixin) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, mixin) parseClass(mixin, class, class, null, mixin) parsePrimaryConstructorOpt(DeclarationKind.Class, mixin, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, mixin, null) @@ -1242,13 +1242,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, native) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, native) parseClass(native, class, class, null, native) parsePrimaryConstructorOpt(DeclarationKind.Class, native, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, native, null) @@ -1271,15 +1271,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(new, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, new) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, new) parseClass(new, class, class, null, new) parsePrimaryConstructorOpt(DeclarationKind.Class, new, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, new, null) @@ -1302,15 +1302,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(null, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null) parseClass(null, class, class, null, null) parsePrimaryConstructorOpt(DeclarationKind.Class, null, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, null, null) @@ -1333,13 +1333,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, of) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, of) parseClass(of, class, class, null, of) parsePrimaryConstructorOpt(DeclarationKind.Class, of, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, of, null) @@ -1362,13 +1362,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, on) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, on) parseClass(on, class, class, null, on) parsePrimaryConstructorOpt(DeclarationKind.Class, on, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, on, null) @@ -1391,15 +1391,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(operator, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, operator) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, operator) parseClass(operator, class, class, null, operator) parsePrimaryConstructorOpt(DeclarationKind.Class, operator, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, operator, null) @@ -1422,13 +1422,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, out) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, out) parseClass(out, class, class, null, out) parsePrimaryConstructorOpt(DeclarationKind.Class, out, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, out, null) @@ -1451,15 +1451,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(part, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, part) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, part) parseClass(part, class, class, null, part) parsePrimaryConstructorOpt(DeclarationKind.Class, part, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, part, null) @@ -1482,13 +1482,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, patch) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, patch) parseClass(patch, class, class, null, patch) parsePrimaryConstructorOpt(DeclarationKind.Class, patch, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, patch, null) @@ -1511,15 +1511,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(required, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, required) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, required) parseClass(required, class, class, null, required) parsePrimaryConstructorOpt(DeclarationKind.Class, required, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, required, null) @@ -1542,15 +1542,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(rethrow, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, rethrow) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, rethrow) parseClass(rethrow, class, class, null, rethrow) parsePrimaryConstructorOpt(DeclarationKind.Class, rethrow, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, rethrow, null) @@ -1573,15 +1573,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(return, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, return) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, return) parseClass(return, class, class, null, return) parsePrimaryConstructorOpt(DeclarationKind.Class, return, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, return, null) @@ -1604,15 +1604,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(set, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, set) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, set) parseClass(set, class, class, null, set) parsePrimaryConstructorOpt(DeclarationKind.Class, set, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, set, null) @@ -1635,13 +1635,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, show) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, show) parseClass(show, class, class, null, show) parsePrimaryConstructorOpt(DeclarationKind.Class, show, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, show, null) @@ -1664,13 +1664,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, source) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, source) parseClass(source, class, class, null, source) parsePrimaryConstructorOpt(DeclarationKind.Class, source, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, source, null) @@ -1693,15 +1693,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(static, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, static) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, static) parseClass(static, class, class, null, static) parsePrimaryConstructorOpt(DeclarationKind.Class, static, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, static, null) @@ -1724,15 +1724,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(super, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, super) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, super) parseClass(super, class, class, null, super) parsePrimaryConstructorOpt(DeclarationKind.Class, super, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, super, null) @@ -1755,15 +1755,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(switch, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, switch) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, switch) parseClass(switch, class, class, null, switch) parsePrimaryConstructorOpt(DeclarationKind.Class, switch, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, switch, null) @@ -1786,13 +1786,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, sync) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, sync) parseClass(sync, class, class, null, sync) parsePrimaryConstructorOpt(DeclarationKind.Class, sync, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, sync, null) @@ -1815,15 +1815,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) listener: handleIdentifier(this, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, this) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, this) parseClass(this, class, class, null, this) parsePrimaryConstructorOpt(DeclarationKind.Class, this, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, this, null) @@ -1846,15 +1846,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(throw, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, throw) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, throw) parseClass(throw, class, class, null, throw) parsePrimaryConstructorOpt(DeclarationKind.Class, throw, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, throw, null) @@ -1877,15 +1877,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(true, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, true) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, true) parseClass(true, class, class, null, true) parsePrimaryConstructorOpt(DeclarationKind.Class, true, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, true, null) @@ -1908,15 +1908,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(try, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, try) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, try) parseClass(try, class, class, null, try) parsePrimaryConstructorOpt(DeclarationKind.Class, try, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, try, null) @@ -1939,15 +1939,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(typedef, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, typedef) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, typedef) parseClass(typedef, class, class, null, typedef) parsePrimaryConstructorOpt(DeclarationKind.Class, typedef, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, typedef, null) @@ -1970,15 +1970,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(var, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, var) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, var) parseClass(var, class, class, null, var) parsePrimaryConstructorOpt(DeclarationKind.Class, var, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, var, null) @@ -2001,15 +2001,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(void, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, void) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, void) parseClass(void, class, class, null, void) parsePrimaryConstructorOpt(DeclarationKind.Class, void, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, void, null) @@ -2032,15 +2032,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(while, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, while) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, while) parseClass(while, class, class, null, while) parsePrimaryConstructorOpt(DeclarationKind.Class, while, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, while, null) @@ -2063,15 +2063,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(with, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, with) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, with) parseClass(with, class, class, null, with) parsePrimaryConstructorOpt(DeclarationKind.Class, with, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, with, null) @@ -2094,13 +2094,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, yield) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, yield) parseClass(yield, class, class, null, yield) parsePrimaryConstructorOpt(DeclarationKind.Class, yield, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, yield, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.expect index 896083f910d..dc13b5ecbbe 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.expect @@ -235,7 +235,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'abstract' as a name here., null, {lexeme: abstract}], abstract, abstract) handleIdentifier(abstract, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, abstract) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, abstract) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -253,7 +253,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'as' as a name here., null, {lexeme: as}], as, as) handleIdentifier(as, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, as) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, as) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -271,7 +271,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, assert) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, assert) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -288,7 +288,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(async, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, async) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, async) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -305,7 +305,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(await, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, await) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, await) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -323,7 +323,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, break) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, break) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -341,7 +341,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, case) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, case) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -359,7 +359,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, catch) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, catch) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -377,7 +377,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, class) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -396,7 +396,7 @@ beginCompilationUnit(class) handleIdentifier(, classOrMixinDeclaration) handleNoTypeVariables(=) handleRecoverableError(ConstWithoutPrimaryConstructor, const, const) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, ) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, ) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -414,7 +414,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, continue) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, continue) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -432,7 +432,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'covariant' as a name here., null, {lexeme: covariant}], covariant, covariant) handleIdentifier(covariant, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, covariant) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, covariant) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -450,7 +450,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, default) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, default) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -468,7 +468,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'deferred' as a name here., null, {lexeme: deferred}], deferred, deferred) handleIdentifier(deferred, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, deferred) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, deferred) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -486,7 +486,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, do) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, do) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -504,7 +504,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'dynamic' as a name here., null, {lexeme: dynamic}], dynamic, dynamic) handleIdentifier(dynamic, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, dynamic) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, dynamic) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -522,7 +522,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, else) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, else) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -540,7 +540,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, enum) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, enum) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -558,7 +558,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'export' as a name here., null, {lexeme: export}], export, export) handleIdentifier(export, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, export) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, export) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -576,7 +576,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, extends) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, extends) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -594,7 +594,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'extension' as a name here., null, {lexeme: extension}], extension, extension) handleIdentifier(extension, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, extension) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, extension) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -612,7 +612,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'external' as a name here., null, {lexeme: external}], external, external) handleIdentifier(external, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, external) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, external) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -630,7 +630,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'factory' as a name here., null, {lexeme: factory}], factory, factory) handleIdentifier(factory, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, factory) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, factory) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -648,7 +648,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, false) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, false) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -666,7 +666,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, final) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, final) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -684,7 +684,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, finally) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, finally) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -702,7 +702,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, for) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, for) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -720,7 +720,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) handleIdentifier(Function, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, Function) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, Function) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -738,7 +738,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'get' as a name here., null, {lexeme: get}], get, get) handleIdentifier(get, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, get) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, get) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -755,7 +755,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(hide, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, hide) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, hide) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -773,7 +773,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, if) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, if) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -791,7 +791,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'implements' as a name here., null, {lexeme: implements}], implements, implements) handleIdentifier(implements, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, implements) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, implements) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -809,7 +809,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'import' as a name here., null, {lexeme: import}], import, import) handleIdentifier(import, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, import) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, import) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -827,7 +827,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, in) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, in) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -844,7 +844,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(inout, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, inout) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, inout) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -862,7 +862,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'interface' as a name here., null, {lexeme: interface}], interface, interface) handleIdentifier(interface, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, interface) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, interface) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -880,7 +880,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, is) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, is) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -898,7 +898,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'late' as a name here., null, {lexeme: late}], late, late) handleIdentifier(late, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, late) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, late) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -916,7 +916,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'library' as a name here., null, {lexeme: library}], library, library) handleIdentifier(library, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, library) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, library) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -934,7 +934,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'mixin' as a name here., null, {lexeme: mixin}], mixin, mixin) handleIdentifier(mixin, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, mixin) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, mixin) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -951,7 +951,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(native, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, native) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, native) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -969,7 +969,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, new) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, new) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -987,7 +987,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, null) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, null) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1004,7 +1004,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(of, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, of) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, of) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1021,7 +1021,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(on, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, on) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, on) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1039,7 +1039,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) handleIdentifier(operator, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, operator) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, operator) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1056,7 +1056,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(out, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, out) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, out) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1074,7 +1074,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'part' as a name here., null, {lexeme: part}], part, part) handleIdentifier(part, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, part) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, part) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1091,7 +1091,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(patch, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, patch) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, patch) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1109,7 +1109,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'required' as a name here., null, {lexeme: required}], required, required) handleIdentifier(required, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, required) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, required) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1127,7 +1127,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, rethrow) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, rethrow) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1145,7 +1145,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, return) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, return) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1163,7 +1163,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'set' as a name here., null, {lexeme: set}], set, set) handleIdentifier(set, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, set) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, set) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1180,7 +1180,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(show, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, show) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, show) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1197,7 +1197,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(source, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, source) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, source) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1215,7 +1215,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'static' as a name here., null, {lexeme: static}], static, static) handleIdentifier(static, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, static) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, static) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1233,7 +1233,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, super) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, super) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1251,7 +1251,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, switch) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, switch) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1268,7 +1268,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(sync, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, sync) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, sync) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1286,7 +1286,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) handleIdentifier(this, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, this) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, this) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1304,7 +1304,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, throw) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, throw) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1322,7 +1322,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, true) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, true) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1340,7 +1340,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, try) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, try) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1358,7 +1358,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'typedef' as a name here., null, {lexeme: typedef}], typedef, typedef) handleIdentifier(typedef, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, typedef) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, typedef) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1376,7 +1376,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, var) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, var) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1394,7 +1394,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, void) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, void) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1412,7 +1412,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, while) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, while) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1430,7 +1430,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[Template(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(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, with) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, with) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1447,7 +1447,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(yield, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, yield) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, yield) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) 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 3de79a4d1d6..8741a83e771 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,15 +6,15 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(abstract, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'abstract' as a name here., null, {lexeme: abstract}], abstract, abstract) listener: handleIdentifier(abstract, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, abstract) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, abstract) parseNamedMixinApplication(abstract, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -34,15 +34,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(as, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'as' as a name here., null, {lexeme: as}], as, as) listener: handleIdentifier(as, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, as) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, as) parseNamedMixinApplication(as, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -62,15 +62,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(assert, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, assert) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, assert) parseNamedMixinApplication(assert, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -90,13 +90,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(async, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, async) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, async) parseNamedMixinApplication(async, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -116,13 +116,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(await, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, await) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, await) parseNamedMixinApplication(await, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -142,15 +142,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(break, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, break) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, break) parseNamedMixinApplication(break, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -170,15 +170,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(case, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, case) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, case) parseNamedMixinApplication(case, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -198,15 +198,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(catch, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, catch) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, catch) parseNamedMixinApplication(catch, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -226,15 +226,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(class, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, class) parseNamedMixinApplication(class, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -254,8 +254,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) insertSyntheticIdentifier(const, classOrMixinDeclaration, message: Message[Template(ExpectedIdentifier), Expected an identifier, but got '='., Try inserting an identifier before '='., {lexeme: =}], messageOnToken: null) @@ -266,7 +266,7 @@ parseUnit(class) listener: handleNoTypeVariables(=) reportRecoverableError(const, ConstWithoutPrimaryConstructor) listener: handleRecoverableError(ConstWithoutPrimaryConstructor, const, const) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, ) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, ) parseNamedMixinApplication(, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -286,15 +286,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(continue, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, continue) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, continue) parseNamedMixinApplication(continue, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -314,15 +314,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(covariant, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'covariant' as a name here., null, {lexeme: covariant}], covariant, covariant) listener: handleIdentifier(covariant, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, covariant) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, covariant) parseNamedMixinApplication(covariant, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -342,15 +342,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(default, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, default) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, default) parseNamedMixinApplication(default, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -370,15 +370,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(deferred, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'deferred' as a name here., null, {lexeme: deferred}], deferred, deferred) listener: handleIdentifier(deferred, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, deferred) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, deferred) parseNamedMixinApplication(deferred, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -398,15 +398,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(do, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, do) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, do) parseNamedMixinApplication(do, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -426,15 +426,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(dynamic, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'dynamic' as a name here., null, {lexeme: dynamic}], dynamic, dynamic) listener: handleIdentifier(dynamic, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, dynamic) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, dynamic) parseNamedMixinApplication(dynamic, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -454,15 +454,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(else, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, else) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, else) parseNamedMixinApplication(else, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -482,15 +482,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(enum, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, enum) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, enum) parseNamedMixinApplication(enum, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -510,15 +510,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(export, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'export' as a name here., null, {lexeme: export}], export, export) listener: handleIdentifier(export, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, export) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, export) parseNamedMixinApplication(export, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -538,15 +538,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extends, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, extends) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, extends) parseNamedMixinApplication(extends, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -566,15 +566,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extension, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'extension' as a name here., null, {lexeme: extension}], extension, extension) listener: handleIdentifier(extension, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, extension) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, extension) parseNamedMixinApplication(extension, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -594,15 +594,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(external, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'external' as a name here., null, {lexeme: external}], external, external) listener: handleIdentifier(external, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, external) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, external) parseNamedMixinApplication(external, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -622,15 +622,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(factory, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'factory' as a name here., null, {lexeme: factory}], factory, factory) listener: handleIdentifier(factory, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, factory) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, factory) parseNamedMixinApplication(factory, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -650,15 +650,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(false, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, false) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, false) parseNamedMixinApplication(false, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -678,15 +678,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(final, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, final) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, final) parseNamedMixinApplication(final, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -706,15 +706,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(finally, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, finally) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, finally) parseNamedMixinApplication(finally, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -734,15 +734,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(for, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, for) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, for) parseNamedMixinApplication(for, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -762,15 +762,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(Function, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) listener: handleIdentifier(Function, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, Function) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, Function) parseNamedMixinApplication(Function, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -790,15 +790,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(get, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'get' as a name here., null, {lexeme: get}], get, get) listener: handleIdentifier(get, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, get) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, get) parseNamedMixinApplication(get, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -818,13 +818,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(hide, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, hide) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, hide) parseNamedMixinApplication(hide, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -844,15 +844,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(if, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, if) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, if) parseNamedMixinApplication(if, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -872,15 +872,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(implements, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'implements' as a name here., null, {lexeme: implements}], implements, implements) listener: handleIdentifier(implements, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, implements) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, implements) parseNamedMixinApplication(implements, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -900,15 +900,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(import, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'import' as a name here., null, {lexeme: import}], import, import) listener: handleIdentifier(import, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, import) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, import) parseNamedMixinApplication(import, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -928,15 +928,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(in, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, in) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, in) parseNamedMixinApplication(in, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -956,13 +956,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(inout, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, inout) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, inout) parseNamedMixinApplication(inout, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -982,15 +982,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(interface, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'interface' as a name here., null, {lexeme: interface}], interface, interface) listener: handleIdentifier(interface, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, interface) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, interface) parseNamedMixinApplication(interface, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1010,15 +1010,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(is, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, is) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, is) parseNamedMixinApplication(is, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1038,15 +1038,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(late, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'late' as a name here., null, {lexeme: late}], late, late) listener: handleIdentifier(late, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, late) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, late) parseNamedMixinApplication(late, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1066,15 +1066,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(library, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'library' as a name here., null, {lexeme: library}], library, library) listener: handleIdentifier(library, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, library) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, library) parseNamedMixinApplication(library, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1094,15 +1094,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(mixin, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'mixin' as a name here., null, {lexeme: mixin}], mixin, mixin) listener: handleIdentifier(mixin, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, mixin) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, mixin) parseNamedMixinApplication(mixin, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1122,13 +1122,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(native, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, native) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, native) parseNamedMixinApplication(native, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1148,15 +1148,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(new, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, new) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, new) parseNamedMixinApplication(new, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1176,15 +1176,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(null, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, null) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null) parseNamedMixinApplication(null, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1204,13 +1204,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(of, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, of) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, of) parseNamedMixinApplication(of, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1230,13 +1230,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(on, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, on) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, on) parseNamedMixinApplication(on, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1256,15 +1256,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(operator, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) listener: handleIdentifier(operator, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, operator) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, operator) parseNamedMixinApplication(operator, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1284,13 +1284,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(out, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, out) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, out) parseNamedMixinApplication(out, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1310,15 +1310,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(part, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'part' as a name here., null, {lexeme: part}], part, part) listener: handleIdentifier(part, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, part) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, part) parseNamedMixinApplication(part, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1338,13 +1338,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(patch, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, patch) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, patch) parseNamedMixinApplication(patch, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1364,15 +1364,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(required, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'required' as a name here., null, {lexeme: required}], required, required) listener: handleIdentifier(required, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, required) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, required) parseNamedMixinApplication(required, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1392,15 +1392,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(rethrow, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, rethrow) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, rethrow) parseNamedMixinApplication(rethrow, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1420,15 +1420,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(return, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, return) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, return) parseNamedMixinApplication(return, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1448,15 +1448,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(set, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'set' as a name here., null, {lexeme: set}], set, set) listener: handleIdentifier(set, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, set) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, set) parseNamedMixinApplication(set, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1476,13 +1476,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(show, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, show) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, show) parseNamedMixinApplication(show, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1502,13 +1502,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(source, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, source) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, source) parseNamedMixinApplication(source, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1528,15 +1528,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(static, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'static' as a name here., null, {lexeme: static}], static, static) listener: handleIdentifier(static, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, static) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, static) parseNamedMixinApplication(static, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1556,15 +1556,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(super, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, super) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, super) parseNamedMixinApplication(super, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1584,15 +1584,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(switch, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, switch) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, switch) parseNamedMixinApplication(switch, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1612,13 +1612,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(sync, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, sync) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, sync) parseNamedMixinApplication(sync, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1638,15 +1638,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) listener: handleIdentifier(this, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, this) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, this) parseNamedMixinApplication(this, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1666,15 +1666,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(throw, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, throw) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, throw) parseNamedMixinApplication(throw, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1694,15 +1694,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(true, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, true) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, true) parseNamedMixinApplication(true, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1722,15 +1722,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(try, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, try) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, try) parseNamedMixinApplication(try, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1750,15 +1750,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(typedef, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(BuiltInIdentifierInDeclaration), Can't use 'typedef' as a name here., null, {lexeme: typedef}], typedef, typedef) listener: handleIdentifier(typedef, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, typedef) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, typedef) parseNamedMixinApplication(typedef, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1778,15 +1778,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(var, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, var) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, var) parseNamedMixinApplication(var, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1806,15 +1806,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(void, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, void) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, void) parseNamedMixinApplication(void, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1834,15 +1834,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(while, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, while) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, while) parseNamedMixinApplication(while, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1862,15 +1862,15 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(with, Template(ExpectedIdentifierButGotKeyword)) listener: handleRecoverableError(Message[Template(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: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, with) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, with) parseNamedMixinApplication(with, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1890,13 +1890,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(yield, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, yield) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, yield) parseNamedMixinApplication(yield, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) 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 92465d6769c..bcd5e2a3b5c 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, null, null, null, null, ) + beginClassDeclaration(class, null, null, null, null, null, null, null, ) handleNoPrimaryConstructor(DeclarationKind.Class, , null) handleNoType() handleClassExtends(null, 1) 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 2e36daef1b4..579bcf7e52c 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) insertSyntheticIdentifier(class, classOrMixinDeclaration, message: Message[Template(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, null, null, null, null, ) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, ) parseClass(, class, class, null, ) parsePrimaryConstructorOpt(DeclarationKind.Class, , null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, , null) 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 f6aee681d70..1e59e258e47 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -68,7 +68,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) 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 07b1cb39c24..c7fdd8f6868 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -74,13 +74,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) 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 ad6af4eacea..5048d229164 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 dd75d127e9f..8240a424b76 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) 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 f8e28e9fc0e..a196eff464b 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 9736f3de286..4e40a05b0c2 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) 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 1725aeef2e2..32f8bcdaf96 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 786121b2627..e85944f37f1 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) 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 ec09707025c..e4f2d7af11f 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 cf400515b5f..4de87ff17f7 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) 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 cbdd9d9d7ab..fbf2007e241 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -128,7 +128,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -201,7 +201,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 51453c8d4ae..0a6a755fa2e 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -84,13 +84,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -199,13 +199,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 bd6b647f692..852810f98f9 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 4aea77f34e8..fa213e9e930 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) 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 f3807ef3fa4..dc9f8e7c206 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -46,7 +46,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -89,7 +89,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -134,7 +134,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -184,7 +184,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -224,7 +224,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -264,7 +264,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -309,7 +309,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -355,7 +355,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -398,7 +398,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -444,7 +444,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -489,7 +489,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -542,7 +542,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -595,7 +595,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -661,7 +661,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 74edfe1923c..2ae157d3f22 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, , library, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(library, , library, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseLibraryName(library) listener: beginUncategorizedTopLevelDeclaration(library) listener: beginLibraryName(library) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime2.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime2.dart.expect index aeaa6697bc7..3afd10cb50f 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime2.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime2.dart.expect @@ -18,7 +18,7 @@ beginCompilationUnit(import) handleImportPrefix(null, as) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(main) endMetadataStar(0) 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 773ecc0aa32..b4019c2620a 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, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -27,7 +27,7 @@ parseUnit(import) parseCombinatorStar(enum) listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) 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 8123b93a2d6..31afd3dd4cd 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 @@ -35,7 +35,7 @@ beginCompilationUnit(enum) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 54083fabe08..696b51b4f23 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -46,13 +46,13 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -169,7 +169,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime4.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime4.dart.expect index fd1bc4f412a..24de540437f 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime4.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime4.dart.expect @@ -113,7 +113,7 @@ beginCompilationUnit(import) handleIdentifierList(1) endShow(show) endCombinators(1) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(import) endMetadataStar(0) @@ -131,7 +131,7 @@ beginCompilationUnit(import) handleIdentifierList(1) endHide(hide) endCombinators(1) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(import) endMetadataStar(0) @@ -156,7 +156,7 @@ beginCompilationUnit(import) handleIdentifierList(1) endHide(hide) endCombinators(2) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(import) endMetadataStar(0) @@ -179,7 +179,7 @@ beginCompilationUnit(import) handleIdentifierList(1) endHide(hide) endCombinators(2) - endImport(import, null, null) + endImport(import, null) beginConditionalUris(as) endConditionalUris(0) handleRecoverableError(Message[Template(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) @@ -209,7 +209,7 @@ beginCompilationUnit(import) handleIdentifierList(3) endShow(show) endCombinators(1) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(import) endMetadataStar(0) @@ -230,7 +230,7 @@ beginCompilationUnit(import) handleIdentifierList(3) endHide(hide) endCombinators(1) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(import) endMetadataStar(0) @@ -261,7 +261,7 @@ beginCompilationUnit(import) handleIdentifierList(3) endHide(hide) endCombinators(2) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(import) endMetadataStar(0) @@ -290,7 +290,7 @@ beginCompilationUnit(import) handleIdentifierList(3) endHide(hide) endCombinators(2) - endImport(import, null, null) + endImport(import, null) beginConditionalUris(as) endConditionalUris(0) handleRecoverableError(Message[Template(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) 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 18536187cd0..96d73e2f381 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, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -32,13 +32,13 @@ parseUnit(import) listener: handleIdentifierList(1) listener: endShow(show) listener: endCombinators(1) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) + parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -64,13 +64,13 @@ parseUnit(import) listener: handleIdentifierList(1) listener: endHide(hide) listener: endCombinators(1) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) + parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -109,13 +109,13 @@ parseUnit(import) listener: handleIdentifierList(1) listener: endHide(hide) listener: endCombinators(2) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) + parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -150,7 +150,7 @@ parseUnit(import) listener: handleIdentifierList(1) listener: endHide(hide) listener: endCombinators(2) - listener: endImport(import, null, null) + listener: endImport(import, null) parseImportRecovery("lib.dart") parseConditionalUriStar("lib.dart") parseImportPrefixOpt("lib.dart") @@ -184,7 +184,7 @@ parseUnit(import) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) + parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -216,13 +216,13 @@ parseUnit(import) listener: handleIdentifierList(3) listener: endShow(show) listener: endCombinators(1) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) + parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -254,13 +254,13 @@ parseUnit(import) listener: handleIdentifierList(3) listener: endHide(hide) listener: endCombinators(1) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) + parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -311,13 +311,13 @@ parseUnit(import) listener: handleIdentifierList(3) listener: endHide(hide) listener: endCombinators(2) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) + parseTopLevelKeywordDeclaration(import, ;, import, null, null, null, DirectiveContext(DirectiveState.ImportAndExport)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -364,7 +364,7 @@ parseUnit(import) listener: handleIdentifierList(3) listener: endHide(hide) listener: endCombinators(2) - listener: endImport(import, null, null) + listener: endImport(import, null) parseImportRecovery("lib.dart") parseConditionalUriStar("lib.dart") parseImportPrefixOpt("lib.dart") 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 41f15283234..d396b6b0c56 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 e9233c4b954..3e16ef89154 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 499e7f17180..3fa1d0227e4 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 4b68e6d7cb0..bad01fa43b9 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 8f8e0beb599..3608221ff85 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 9062df451c4..95f3745de30 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 97866b9d209..d891accaea7 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 d61f3bdc65c..8b12bbac4dd 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 92ac5a0bff6..94937bc8993 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 930bfa1c0c8..5c9606dab59 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 3c4e358c2e5..5aa4ca39754 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 064efea6873..9df618ced42 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 8c945c0db58..2da37830c7d 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, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(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 3997f421d2a..0fc2e4c8597 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -94,7 +94,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -160,7 +160,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B2, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B2) + beginClassDeclaration(class, null, null, null, null, null, null, null, B2) handleNoPrimaryConstructor(DeclarationKind.Class, B2, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -228,7 +228,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B3, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B3) + beginClassDeclaration(class, null, null, null, null, null, null, null, B3) handleNoPrimaryConstructor(DeclarationKind.Class, B3, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -321,7 +321,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -397,7 +397,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, null, null, D) handleNoPrimaryConstructor(DeclarationKind.Class, D, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -465,7 +465,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(E, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, E) + beginClassDeclaration(class, null, null, null, null, null, null, null, E) handleNoPrimaryConstructor(DeclarationKind.Class, E, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) 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 56406e72623..5d157f2c52f 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -123,13 +123,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -255,13 +255,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B2) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B2) parseClass(B2, class, class, null, B2) parsePrimaryConstructorOpt(DeclarationKind.Class, B2, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B2, null) @@ -394,13 +394,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B3) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B3) parseClass(B3, class, class, null, B3) parsePrimaryConstructorOpt(DeclarationKind.Class, B3, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B3, null) @@ -578,13 +578,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -734,13 +734,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, D) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, D) parseClass(D, class, class, null, D) parsePrimaryConstructorOpt(DeclarationKind.Class, D, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, D, null) @@ -876,13 +876,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, E) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, E) parseClass(E, class, class, null, E) parsePrimaryConstructorOpt(DeclarationKind.Class, E, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, E, null) 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 52e79175f9b..5631d5b2dbd 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -68,7 +68,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -133,7 +133,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B2, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B2) + beginClassDeclaration(class, null, null, null, null, null, null, null, B2) handleNoPrimaryConstructor(DeclarationKind.Class, B2, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -200,7 +200,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B3, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B3) + beginClassDeclaration(class, null, null, null, null, null, null, null, B3) handleNoPrimaryConstructor(DeclarationKind.Class, B3, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -292,7 +292,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -367,7 +367,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, null, null, D) handleNoPrimaryConstructor(DeclarationKind.Class, D, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) @@ -434,7 +434,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(E, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, E) + beginClassDeclaration(class, null, null, null, null, null, null, null, E) handleNoPrimaryConstructor(DeclarationKind.Class, E, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) 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 1c521aa15e1..d0848acac4d 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -123,13 +123,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -252,13 +252,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B2) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B2) parseClass(B2, class, class, null, B2) parsePrimaryConstructorOpt(DeclarationKind.Class, B2, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B2, null) @@ -388,13 +388,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B3) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B3) parseClass(B3, class, class, null, B3) parsePrimaryConstructorOpt(DeclarationKind.Class, B3, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B3, null) @@ -569,13 +569,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -722,13 +722,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, D) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, D) parseClass(D, class, class, null, D) parsePrimaryConstructorOpt(DeclarationKind.Class, D, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, D, null) @@ -861,13 +861,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, E) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, E) parseClass(E, class, class, null, E) parsePrimaryConstructorOpt(DeclarationKind.Class, E, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, E, null) 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 d1377435745..45949667da2 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -135,7 +135,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -215,7 +215,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -251,7 +251,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 2423c044076..a9742849310 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -131,13 +131,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -313,13 +313,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -393,13 +393,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 d78b3be1082..15e06daafef 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 @@ -982,7 +982,7 @@ beginCompilationUnit(Future) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(await, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, await) + beginClassDeclaration(class, null, null, null, null, null, null, null, await) handleNoPrimaryConstructor(DeclarationKind.Class, await, null) handleNoType(await) handleClassExtends(null, 1) 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 a8806af33da..d8055c2d7d5 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 @@ -2401,13 +2401,13 @@ parseUnit(Future) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, await) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, await) parseClass(await, class, class, null, await) parsePrimaryConstructorOpt(DeclarationKind.Class, await, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, await, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_49477.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_49477.dart.expect index efb246d2437..2040a0cbb07 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_49477.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_49477.dart.expect @@ -20,7 +20,7 @@ beginCompilationUnit(import) handleImportPrefix(null, null) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(void) endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_49477.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_49477.dart.intertwined.expect index 446be0f0566..c49b65e74a0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_49477.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_49477.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -23,7 +23,7 @@ parseUnit(import) parseCombinatorStar('dart:io') listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_49477_prime.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_49477_prime.dart.expect index 4e1f2796a67..454b1e2acbe 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_49477_prime.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_49477_prime.dart.expect @@ -16,7 +16,7 @@ beginCompilationUnit(import) handleImportPrefix(null, null) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(void) endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_49477_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_49477_prime.dart.intertwined.expect index 3291eea1929..00be65b98a8 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_49477_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_49477_prime.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -23,7 +23,7 @@ parseUnit(import) parseCombinatorStar('dart:io') listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_50838.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_50838.dart.intertwined.expect index 06cd8f8bda9..8223d5d2a7e 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_50838.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_50838.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(mixin) parseMetadataStar() listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, , mixin, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(mixin, , mixin, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseMixin(mixin, null, null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -29,7 +29,7 @@ parseUnit(mixin) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.expect index ba9ac401c5c..a6a9ba6b8f2 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.expect @@ -67,7 +67,7 @@ beginCompilationUnit(var) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -152,7 +152,7 @@ beginCompilationUnit(var) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -247,7 +247,7 @@ beginCompilationUnit(var) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.intertwined.expect index 7e0cb5dcc52..9468c3110c2 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.intertwined.expect @@ -164,13 +164,13 @@ parseUnit(var) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -357,13 +357,13 @@ parseUnit(var) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -578,13 +578,13 @@ parseUnit(var) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_56912.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_56912.dart.intertwined.expect index 1691ddf6b75..c16350aad8f 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_56912.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_56912.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime.dart.intertwined.expect index 380daf4089d..2ef652c5fd9 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime_2.dart.intertwined.expect index d6ae99c32ea..a4ee7975afe 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime_2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime_2.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime_3.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime_3.dart.intertwined.expect index a7471800bdc..ac590eb47de 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime_3.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_56912_prime_3.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) 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 7d2f7fd6477..1ad9f1d73b1 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, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) handleNoType(WrapperClass) handleClassExtends(null, 1) 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 fcbb51b48ec..932edd8c802 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, null, WrapperClass) parsePrimaryConstructorOpt(DeclarationKind.Class, WrapperClass, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) 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 0b89d115c3b..e8f59db5dda 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 @@ -486,7 +486,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(WrapperClass, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) handleNoType(WrapperClass) handleClassExtends(null, 1) 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 6a0bb571e44..ea7318c42e1 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, null, WrapperClass) parsePrimaryConstructorOpt(DeclarationKind.Class, WrapperClass, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods_2.dart.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods_2.dart.expect index 4de663722be..8ca4f14a8e7 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods_2.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods_2.dart.expect @@ -474,7 +474,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(WrapperClass, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) handleNoType(WrapperClass) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods_2.dart.intertwined.expect index c7ffc586d9f..603fef7b231 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods_2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods_2.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, null, WrapperClass) parsePrimaryConstructorOpt(DeclarationKind.Class, WrapperClass, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) 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 fa5421ea194..86c8eae0a2d 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 3adecadb46a..9f06a0f86bd 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, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 a3b20f5bf15..9cd38dc7c65 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, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -27,7 +27,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -51,7 +51,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -72,7 +72,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -96,7 +96,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -117,7 +117,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -141,7 +141,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -160,7 +160,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -182,7 +182,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -201,7 +201,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -223,7 +223,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -244,7 +244,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -268,7 +268,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -289,7 +289,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -313,7 +313,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -334,7 +334,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -358,7 +358,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -379,7 +379,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -403,7 +403,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -424,7 +424,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -448,7 +448,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -469,7 +469,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -493,7 +493,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -514,7 +514,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -538,7 +538,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -559,7 +559,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -583,7 +583,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -604,7 +604,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -628,7 +628,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -649,7 +649,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -673,7 +673,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -694,7 +694,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -718,7 +718,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -739,7 +739,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -763,7 +763,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -784,7 +784,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -808,7 +808,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -829,7 +829,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -853,7 +853,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -874,7 +874,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -898,7 +898,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -919,7 +919,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -943,7 +943,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -964,7 +964,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -988,7 +988,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1009,7 +1009,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1033,7 +1033,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1054,7 +1054,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1078,7 +1078,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1099,7 +1099,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1123,7 +1123,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1144,7 +1144,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1168,7 +1168,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1189,7 +1189,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1213,7 +1213,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1234,7 +1234,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1258,7 +1258,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1279,7 +1279,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1303,7 +1303,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1322,7 +1322,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1344,7 +1344,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1365,7 +1365,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1389,7 +1389,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1410,7 +1410,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1434,7 +1434,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1455,7 +1455,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1479,7 +1479,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1500,7 +1500,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1524,7 +1524,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1543,7 +1543,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1565,7 +1565,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1586,7 +1586,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1610,7 +1610,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1631,7 +1631,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1655,7 +1655,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1676,7 +1676,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1700,7 +1700,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1721,7 +1721,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1745,7 +1745,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1766,7 +1766,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1790,7 +1790,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1809,7 +1809,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1831,7 +1831,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1852,7 +1852,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1876,7 +1876,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1897,7 +1897,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1921,7 +1921,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1940,7 +1940,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1962,7 +1962,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1981,7 +1981,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2003,7 +2003,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2024,7 +2024,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2048,7 +2048,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2067,7 +2067,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2089,7 +2089,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2110,7 +2110,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2134,7 +2134,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2153,7 +2153,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2175,7 +2175,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2196,7 +2196,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2220,7 +2220,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2241,7 +2241,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2265,7 +2265,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2286,7 +2286,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2310,7 +2310,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2331,7 +2331,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2355,7 +2355,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2374,7 +2374,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2396,7 +2396,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2415,7 +2415,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2437,7 +2437,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2458,7 +2458,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2482,7 +2482,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2503,7 +2503,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2527,7 +2527,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2548,7 +2548,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2572,7 +2572,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2591,7 +2591,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2613,7 +2613,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2634,7 +2634,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2658,7 +2658,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2679,7 +2679,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2703,7 +2703,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2724,7 +2724,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2748,7 +2748,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2769,7 +2769,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2793,7 +2793,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2814,7 +2814,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2838,7 +2838,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2859,7 +2859,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2883,7 +2883,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2904,7 +2904,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2971,7 +2971,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2992,7 +2992,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -3016,7 +3016,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -3037,7 +3037,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -3061,7 +3061,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -3080,7 +3080,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, 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 2d59dfdc6de..def44c513a9 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 11a3c491b4c..4b70c0be862 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 c4fca21d82e..e847c261167 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 809a8a59a43..cefef00038b 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 2ff85c83c27..5747b374238 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, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -53,7 +53,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(M1, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, M1) + beginClassDeclaration(class, null, null, null, null, null, null, null, M1) handleNoPrimaryConstructor(DeclarationKind.Class, M1, null) handleNoType(M1) handleClassExtends(null, 1) 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 8088d2aed36..b3bbbdbd233 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -58,13 +58,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, M1) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, M1) parseClass(M1, class, class, null, M1) parsePrimaryConstructorOpt(DeclarationKind.Class, M1, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, M1, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_01.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_01.dart.expect index 5dda0d25778..d868adc2833 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_01.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_01.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) @@ -84,7 +84,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) handleNoType(Bar) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_01.dart.intertwined.expect index b08fbc1e4cb..79610e3352b 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_01.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) @@ -179,13 +179,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, null, Bar) parsePrimaryConstructorOpt(DeclarationKind.Class, Bar, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_02.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_02.dart.expect index cdbc3a49d9a..d657e38632b 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_02.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_02.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_02.dart.intertwined.expect index dace6c4fae4..229c19e35e4 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_02.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_03.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_03.dart.expect index adae0507577..4d8c5af0b34 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_03.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_03.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) @@ -112,7 +112,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) handleNoType(Bar) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_03.dart.intertwined.expect index 57507671fff..8587f076477 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_03.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_03.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) @@ -261,13 +261,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, null, Bar) parsePrimaryConstructorOpt(DeclarationKind.Class, Bar, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_04.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_04.dart.expect index dcc83f44439..84265358047 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_04.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_04.dart.expect @@ -14,7 +14,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) @@ -121,7 +121,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) handleNoType(Bar) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_04.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_04.dart.intertwined.expect index 78a18253b5f..3c8a1d5f5c3 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_04.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_04.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) @@ -288,13 +288,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, null, Bar) parsePrimaryConstructorOpt(DeclarationKind.Class, Bar, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_05.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_05.dart.expect index b92cf6b4f5c..68301d2df02 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_05.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_05.dart.expect @@ -14,7 +14,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) @@ -123,7 +123,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) handleNoType(Bar) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_05.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_05.dart.intertwined.expect index 0b576524c96..fd0ad96e393 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_05.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_05.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) @@ -291,13 +291,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, null, Bar) parsePrimaryConstructorOpt(DeclarationKind.Class, Bar, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_06.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_06.dart.expect index 99ea48cf895..25aa8033b82 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_06.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_06.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_06.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_06.dart.intertwined.expect index 2b7f76f339c..e4c0288e912 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_06.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_06.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_07.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_07.dart.expect index 87cd17cad5b..9105904afe7 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_07.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_07.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_07.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_07.dart.intertwined.expect index 923191bf734..2b1dd534091 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_07.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_07.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_08.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_08.dart.expect index c7b5ed81ba9..ba6fd3b4406 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_08.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_08.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_08.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_08.dart.intertwined.expect index ac44b9c9237..2f07d7509b8 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_08.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_08.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_09.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_09.dart.expect index c8d7fb31907..4a77d685ee5 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_09.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_09.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_09.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_09.dart.intertwined.expect index a5af7695470..fefbced57f7 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_09.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_09.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_10.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_10.dart.expect index 3af3c807c62..90267ccb4a4 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_10.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_10.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_10.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_10.dart.intertwined.expect index 5ae1bbfeeae..8590b5a425e 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_10.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_10.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_11.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_11.dart.expect index 26eb80bd9e5..1d4a05ab91f 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_11.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_11.dart.expect @@ -14,7 +14,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_11.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_11.dart.intertwined.expect index 74a59d36f7e..1b6b3f225cd 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_11.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_11.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_12.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_12.dart.expect index 75adb13da8f..59bc9b1e802 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_12.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_12.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_12.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_12.dart.intertwined.expect index 2a7a7a4656c..b4f52736f87 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_12.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_12.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_13.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_13.dart.expect index 225e43e6df9..2d29bd0fa29 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_13.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_13.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_13.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_13.dart.intertwined.expect index e69612ef4eb..b71886c6ee0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_13.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_13.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_14.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_14.dart.expect index fd93fe980b8..ce9ea1dbb93 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_14.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_14.dart.expect @@ -18,7 +18,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_14.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_14.dart.intertwined.expect index 6017453264f..2991e6e2c36 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_14.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_14.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_15.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_15.dart.expect index 46f7af8e3e1..19775a7cde8 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_15.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_15.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_15.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_15.dart.intertwined.expect index 7a2031d1e79..fec3da48ef0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_15.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_15.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken({)) parseMetadataStar(UnmatchedToken({)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken({), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_1.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_1.dart.expect index e53d225c354..e5f605a76b5 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_1.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_1.dart.expect @@ -14,7 +14,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -60,7 +60,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -131,7 +131,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_1.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_1.dart.intertwined.expect index 3cc60c6e52c..98e7bb22f8f 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_1.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_1.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken(${)) parseMetadataStar(UnmatchedToken(${)) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken(${), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken(${), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -99,13 +99,13 @@ parseUnit(UnmatchedToken(${)) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -262,13 +262,13 @@ parseUnit(UnmatchedToken(${)) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_2.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_2.dart.expect index e22384ff323..8875c6dec78 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_2.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_2.dart.expect @@ -46,7 +46,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -92,7 +92,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -186,7 +186,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_2.dart.intertwined.expect index 9e6948ca37a..b27397d9d59 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_interpolation_2.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnmatchedToken(${)) parseMetadataStar(UnmatchedToken(()) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken((), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken((), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -99,13 +99,13 @@ parseUnit(UnmatchedToken(${)) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -336,13 +336,13 @@ parseUnit(UnmatchedToken(${)) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_missing_end_quote.dart.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_missing_end_quote.dart.expect index afecad46afe..635e2b41069 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_missing_end_quote.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_missing_end_quote.dart.expect @@ -18,7 +18,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -64,7 +64,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, null, B) handleNoPrimaryConstructor(DeclarationKind.Class, B, null) handleNoType(B) handleClassExtends(null, 1) @@ -129,7 +129,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_missing_end_quote.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_missing_end_quote.dart.intertwined.expect index ebb77dbe1f7..70c52d1349f 100644 --- a/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_missing_end_quote.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/with_outline/typing_string_missing_end_quote.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(UnterminatedString(")) parseMetadataStar(UnmatchedToken(()) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, UnmatchedToken((), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, UnmatchedToken((), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -99,13 +99,13 @@ parseUnit(UnterminatedString(")) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, B) parseClass(B, class, class, null, B) parsePrimaryConstructorOpt(DeclarationKind.Class, B, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, B, null) @@ -238,13 +238,13 @@ parseUnit(UnterminatedString(")) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 fdf1df36729..67b9c9aa173 100644 --- a/pkg/front_end/parser_testcases/extension_named_type.dart.expect +++ b/pkg/front_end/parser_testcases/extension_named_type.dart.expect @@ -14,7 +14,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 3f1f90ec8bf..7dd34d409d5 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,7 +35,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/extension_type.dart.expect b/pkg/front_end/parser_testcases/extension_type.dart.expect index cb84b55f0e7..9404755433d 100644 --- a/pkg/front_end/parser_testcases/extension_type.dart.expect +++ b/pkg/front_end/parser_testcases/extension_type.dart.expect @@ -18,7 +18,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 97b4d556ca5..fa78844d1cc 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,7 +35,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/extensions/const.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/const.dart.intertwined.expect index e100853a303..3349cafe618 100644 --- a/pkg/front_end/parser_testcases/extensions/const.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extensions/const.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) diff --git a/pkg/front_end/parser_testcases/extensions/covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/covariant.dart.expect index 6bd00a2664a..629e17c881f 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -26,7 +26,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) 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 ba9e79d15b1..fbc506a6079 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,13 +35,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -67,7 +67,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) 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 87d89b48a26..d9a3179905d 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -20,7 +20,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) 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 0b7d2f30e90..86901d9b546 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,13 +35,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -67,7 +67,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) diff --git a/pkg/front_end/parser_testcases/extensions/static.dart.expect b/pkg/front_end/parser_testcases/extensions/static.dart.expect index 99d016ac002..e49bef39bba 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -20,7 +20,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) 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 a8335ab6c19..a4ccb0a3301 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,13 +35,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -67,7 +67,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) 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 0fc171fdfba..ff70edaae64 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) @@ -26,7 +26,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(A, typeReference) handleNoTypeArguments({) 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 05b12a63a90..6908f054cc0 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) @@ -35,13 +35,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -67,7 +67,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) 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 be78264bb89..b8c3ba5e470 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, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) handleNoType(WrapperClass) handleClassExtends(null, 1) 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 7cff0a984d4..2fa303a930f 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, null, WrapperClass) parsePrimaryConstructorOpt(DeclarationKind.Class, WrapperClass, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) 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 b590e2b1fd8..048fd2b4a9b 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, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) handleNoType(WrapperClass) handleClassExtends(null, 1) 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 c1fa914f5cf..d20687d2a79 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, null, WrapperClass) parsePrimaryConstructorOpt(DeclarationKind.Class, WrapperClass, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, WrapperClass, null) 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 9c053ef6c6a..abe824bdd31 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, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -36,7 +36,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -70,7 +70,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -110,7 +110,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -154,7 +154,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -198,7 +198,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -242,7 +242,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -272,7 +272,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -306,7 +306,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -346,7 +346,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -390,7 +390,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -434,7 +434,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -478,7 +478,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -520,7 +520,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -566,7 +566,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -628,7 +628,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -694,7 +694,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -750,7 +750,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -806,7 +806,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -852,7 +852,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -902,7 +902,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -958,7 +958,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1018,7 +1018,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1078,7 +1078,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, 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 afd805ecfbf..8dc7f53d5dd 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, null, null, null, null, ConfigurationService) + beginClassDeclaration(class, null, null, null, null, null, null, null, ConfigurationService) handleNoPrimaryConstructor(DeclarationKind.Class, ConfigurationService, null) handleNoType(ConfigurationService) handleClassExtends(null, 1) @@ -276,7 +276,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Configuration, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Configuration) + beginClassDeclaration(class, null, null, null, null, null, null, null, Configuration) handleNoPrimaryConstructor(DeclarationKind.Class, Configuration, null) handleNoType(Configuration) handleClassExtends(null, 1) 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 c18d9c6e7c3..687af4be819 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, ConfigurationService) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, ConfigurationService) parseClass(ConfigurationService, class, class, null, ConfigurationService) parsePrimaryConstructorOpt(DeclarationKind.Class, ConfigurationService, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, ConfigurationService, null) @@ -526,13 +526,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Configuration) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Configuration) parseClass(Configuration, class, class, null, Configuration) parsePrimaryConstructorOpt(DeclarationKind.Class, Configuration, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Configuration, null) 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 c5adcc130ac..ab0ff949ef5 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 @@ -32,7 +32,7 @@ parseUnit(@) listener: endArguments(1, (, )) listener: endMetadata(@, null, )) listener: endMetadataStar(1) - parseTopLevelKeywordDeclaration(typedef, ), typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, ), typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, 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 9d771d635ec..617b29c8ae6 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[Template(BuiltInIdentifierInDeclaration), Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) handleIdentifier(Function, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Function) + beginClassDeclaration(class, null, null, null, null, null, null, null, Function) handleNoPrimaryConstructor(DeclarationKind.Class, Function, null) handleNoType(Function) handleClassExtends(null, 1) @@ -64,7 +64,7 @@ beginCompilationUnit(class) handleNoType(Function) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) 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 99b844483dd..80c5ef34845 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(Function, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, Function) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Function) parseClass(Function, class, class, null, Function) parsePrimaryConstructorOpt(DeclarationKind.Class, Function, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Function, null) @@ -37,8 +37,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -55,7 +55,7 @@ parseUnit(class) listener: handleNoType(Function) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -78,7 +78,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, }, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, }, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -97,7 +97,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -126,7 +126,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) @@ -147,7 +147,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) @@ -183,7 +183,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -208,7 +208,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, 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 b86242beb3b..442730bf96a 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 @@ -379,7 +379,7 @@ parseUnit(void) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) diff --git a/pkg/front_end/parser_testcases/general/issue_49197.dart.expect b/pkg/front_end/parser_testcases/general/issue_49197.dart.expect index af234b488a9..cb8d84f21c4 100644 --- a/pkg/front_end/parser_testcases/general/issue_49197.dart.expect +++ b/pkg/front_end/parser_testcases/general/issue_49197.dart.expect @@ -18,6 +18,6 @@ beginCompilationUnit(import) handleImportPrefix(null, as) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) endCompilationUnit(1, ) 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 b5065244414..d13575297de 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, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -27,7 +27,7 @@ parseUnit(import) parseCombinatorStar(Function) listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) reportAllErrorTokens(import) listener: endCompilationUnit(1, ) diff --git a/pkg/front_end/parser_testcases/general/metadata.dart.expect b/pkg/front_end/parser_testcases/general/metadata.dart.expect index db25a866bb8..76ddf07efbb 100644 --- a/pkg/front_end/parser_testcases/general/metadata.dart.expect +++ b/pkg/front_end/parser_testcases/general/metadata.dart.expect @@ -114,7 +114,7 @@ beginCompilationUnit(@) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, null, X) handleNoPrimaryConstructor(DeclarationKind.Class, X, null) handleNoType(X) handleClassExtends(null, 1) @@ -975,7 +975,7 @@ beginCompilationUnit(@) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, null, Y) handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) handleNoType(Y) handleClassExtends(null, 1) 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 406c936edad..adff9bcee59 100644 --- a/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect @@ -200,13 +200,13 @@ parseUnit(@) listener: endArguments(1, (, )) listener: endMetadata(@, ., )) listener: endMetadataStar(10) - parseTopLevelKeywordDeclaration(class, ), class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ), class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, X) parseClass(X, class, class, null, X) parsePrimaryConstructorOpt(DeclarationKind.Class, X, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, X, null) @@ -229,7 +229,7 @@ parseUnit(@) parseMetadataStar(}) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, }, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, }, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -315,7 +315,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -413,7 +413,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -517,7 +517,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -621,7 +621,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -740,7 +740,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -865,7 +865,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -981,7 +981,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1106,7 +1106,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1234,7 +1234,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1564,13 +1564,13 @@ parseUnit(@) listener: endArguments(1, (, )) listener: endMetadata(@, ., )) listener: endMetadataStar(9) - parseTopLevelKeywordDeclaration(class, ), class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ), class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Y) parseClass(Y, class, class, null, Y) parsePrimaryConstructorOpt(DeclarationKind.Class, Y, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) diff --git a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect index 7f350b1a2c0..8930987602e 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 @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -119,7 +119,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, null, null, D) handleNoPrimaryConstructor(DeclarationKind.Class, D, null) handleNoType(D) handleClassExtends(null, 1) 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 439ebaa05af..df3f47888e1 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -200,13 +200,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, D) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, D) parseClass(D, class, class, null, D) parsePrimaryConstructorOpt(DeclarationKind.Class, D, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, D, null) 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 32e0a0b5551..3540c4d0d86 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 9445178f13f..1bc89ae2aba 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect index 2fbcff3670f..8b1071aec03 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[Template(BuiltInIdentifierInDeclaration), Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) handleIdentifier(operator, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, operator) + beginClassDeclaration(class, null, null, null, null, null, null, null, operator) handleNoPrimaryConstructor(DeclarationKind.Class, operator, null) handleNoType(operator) handleClassExtends(null, 1) 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 9edaaa934e5..3dd7d94324d 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(operator, Template(BuiltInIdentifierInDeclaration)) listener: handleRecoverableError(Message[Template(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, null, null, null, null, operator) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, operator) parseClass(operator, class, class, null, operator) parsePrimaryConstructorOpt(DeclarationKind.Class, operator, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, operator, null) diff --git a/pkg/front_end/parser_testcases/inline_class/extends_with.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/extends_with.dart.intertwined.expect index 3d1184b7eec..fc7068cc3bb 100644 --- a/pkg/front_end/parser_testcases/inline_class/extends_with.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/inline_class/extends_with.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -61,7 +61,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -119,7 +119,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -180,7 +180,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -243,7 +243,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -309,7 +309,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -367,7 +367,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -428,7 +428,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -492,7 +492,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -558,7 +558,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -627,7 +627,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -685,7 +685,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -746,7 +746,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -810,7 +810,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -876,7 +876,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -945,7 +945,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1008,7 +1008,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1074,7 +1074,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1143,7 +1143,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1214,7 +1214,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1288,7 +1288,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1346,7 +1346,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1415,7 +1415,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/inline_class/extension_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/extension_type.dart.intertwined.expect index 9fb50b6ed45..7e7ec77576b 100644 --- a/pkg/front_end/parser_testcases/inline_class/extension_type.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/inline_class/extension_type.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -43,7 +43,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -86,7 +86,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -135,7 +135,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -835,7 +835,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -876,7 +876,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -915,7 +915,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.intertwined.expect index 0e0527f05af..50d8265db61 100644 --- a/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -43,7 +43,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -86,7 +86,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -135,7 +135,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -833,7 +833,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -874,7 +874,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -913,7 +913,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/inline_class/extension_type_missing_name.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/extension_type_missing_name.dart.intertwined.expect index a99555caa44..9c823e32105 100644 --- a/pkg/front_end/parser_testcases/inline_class/extension_type_missing_name.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/inline_class/extension_type_missing_name.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -47,7 +47,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -88,7 +88,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -131,7 +131,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -174,7 +174,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -223,7 +223,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -272,7 +272,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -323,7 +323,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/inline_class/extension_type_on.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/extension_type_on.dart.intertwined.expect index 64501e5f3aa..14fa8919c50 100644 --- a/pkg/front_end/parser_testcases/inline_class/extension_type_on.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/inline_class/extension_type_on.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -43,7 +43,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -80,7 +80,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -129,7 +129,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/inline_class/inline_class.dart.expect b/pkg/front_end/parser_testcases/inline_class/inline_class.dart.expect index dc56dbbfd1d..9acb3547f17 100644 --- a/pkg/front_end/parser_testcases/inline_class/inline_class.dart.expect +++ b/pkg/front_end/parser_testcases/inline_class/inline_class.dart.expect @@ -33,7 +33,7 @@ beginCompilationUnit(inline) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) @@ -60,7 +60,7 @@ beginCompilationUnit(inline) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, Class) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) diff --git a/pkg/front_end/parser_testcases/inline_class/inline_class.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/inline_class.dart.intertwined.expect index 3d39267d3ee..de240e106f8 100644 --- a/pkg/front_end/parser_testcases/inline_class/inline_class.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/inline_class/inline_class.dart.intertwined.expect @@ -29,13 +29,13 @@ parseUnit(inline) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -81,13 +81,13 @@ parseUnit(inline) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, Class) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/parser_testcases/inline_class/no_body.dart.expect b/pkg/front_end/parser_testcases/inline_class/no_body.dart.expect index 8fbf30ccd93..362d9133065 100644 --- a/pkg/front_end/parser_testcases/inline_class/no_body.dart.expect +++ b/pkg/front_end/parser_testcases/inline_class/no_body.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(;) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/inline_class/no_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/no_body.dart.intertwined.expect index ada576a74e9..b11f2263ad9 100644 --- a/pkg/front_end/parser_testcases/inline_class/no_body.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/inline_class/no_body.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -32,7 +32,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, ;, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, ;, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -52,7 +52,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) @@ -68,7 +68,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -102,7 +102,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -139,7 +139,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/inline_class/no_primary_constructor.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/no_primary_constructor.dart.intertwined.expect index 7711a4f7365..528ae467d66 100644 --- a/pkg/front_end/parser_testcases/inline_class/no_primary_constructor.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/inline_class/no_primary_constructor.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -28,7 +28,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -53,7 +53,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -81,7 +81,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -111,7 +111,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -144,7 +144,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -180,7 +180,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -214,7 +214,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -251,7 +251,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) 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 24d63b525e5..8a29bb02d62 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, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) @@ -85,7 +85,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) @@ -112,7 +112,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, Class) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -141,7 +141,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, Class) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) 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 a0f68df140e..8ff6c8ed919 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, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -83,13 +83,13 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -135,13 +135,13 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, Class) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) @@ -186,13 +186,13 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, Class) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) 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 163e8746e37..cc054b102e1 100644 --- a/pkg/front_end/parser_testcases/macros/macro_class.dart.expect +++ b/pkg/front_end/parser_testcases/macros/macro_class.dart.expect @@ -1,42 +1,118 @@ +Problems reported: + +parser/macros/macro_class:1:1: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +macro class Class {} +^^^^^ + +parser/macros/macro_class:1:1: Expected ';' after this. +macro class Class {} +^^^^^ + +parser/macros/macro_class:2:1: Can't have modifier 'abstract' here. +abstract macro class Class {} +^^^^^^^^ + +parser/macros/macro_class:2:10: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +abstract macro class Class {} + ^^^^^ + +parser/macros/macro_class:2:10: Expected ';' after this. +abstract macro class Class {} + ^^^^^ + +parser/macros/macro_class:3:1: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +macro class Class = Object with Mixin; +^^^^^ + +parser/macros/macro_class:3:1: Expected ';' after this. +macro class Class = Object with Mixin; +^^^^^ + +parser/macros/macro_class:4:1: Can't have modifier 'abstract' here. +abstract macro class Class = Object with Mixin; +^^^^^^^^ + +parser/macros/macro_class:4:10: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +abstract macro class Class = Object with Mixin; + ^^^^^ + +parser/macros/macro_class:4:10: Expected ';' after this. +abstract macro class Class = Object with Mixin; + ^^^^^ + beginCompilationUnit(macro) beginMetadataStar(macro) endMetadataStar(0) - beginClassOrMixinOrNamedMixinApplicationPrelude(macro) + beginTopLevelMember(macro) + beginFields(DeclarationKind.TopLevel, null, null, null, null, null, null, null, ) + handleRecoverableError(MissingConstFinalVarOrType, macro, macro) + handleNoType() + handleIdentifier(macro, topLevelVariableDeclaration) + handleNoFieldInitializer(class) + handleRecoverableError(Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}], macro, macro) + endTopLevelFields(null, null, null, null, null, null, null, 1, macro, ;) + endTopLevelDeclaration(;) + beginMetadataStar(class) + endMetadataStar(0) + beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(macro, null, macro, null, null, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() handleImplements(null, 0) - handleClassHeader(macro, class, null) + handleClassHeader(class, class, null) beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) - endClassDeclaration(macro, }) + endClassDeclaration(class, }) endTopLevelDeclaration(}) beginMetadataStar(abstract) endMetadataStar(0) - beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) + beginTopLevelMember(abstract) + handleRecoverableError(Message[Template(ExtraneousModifier), Can't have modifier 'abstract' here., Try removing 'abstract'., {lexeme: abstract}], abstract, abstract) + beginFields(DeclarationKind.TopLevel, null, abstract, null, null, null, null, null, }) + handleRecoverableError(MissingConstFinalVarOrType, macro, macro) + handleNoType(abstract) + handleIdentifier(macro, topLevelVariableDeclaration) + handleNoFieldInitializer(class) + handleRecoverableError(Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}], macro, macro) + endTopLevelFields(null, abstract, null, null, null, null, null, 1, abstract, ;) + endTopLevelDeclaration(;) + beginMetadataStar(class) + endMetadataStar(0) + beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, macro, null, null, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() handleImplements(null, 0) - handleClassHeader(abstract, class, null) + handleClassHeader(class, class, null) beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) - endClassDeclaration(abstract, }) + endClassDeclaration(class, }) endTopLevelDeclaration(}) beginMetadataStar(macro) endMetadataStar(0) - beginClassOrMixinOrNamedMixinApplicationPrelude(macro) + beginTopLevelMember(macro) + beginFields(DeclarationKind.TopLevel, null, null, null, null, null, null, null, }) + handleRecoverableError(MissingConstFinalVarOrType, macro, macro) + handleNoType(}) + handleIdentifier(macro, topLevelVariableDeclaration) + handleNoFieldInitializer(class) + handleRecoverableError(Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}], macro, macro) + endTopLevelFields(null, null, null, null, null, null, null, 1, macro, ;) + endTopLevelDeclaration(;) + beginMetadataStar(class) + endMetadataStar(0) + beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(macro, null, macro, null, null, null, null, null, null, Class) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -46,14 +122,26 @@ beginCompilationUnit(macro) handleType(Mixin, null) endTypeList(1) handleNamedMixinApplicationWithClause(with) - endNamedMixinApplication(macro, class, =, null, ;) + endNamedMixinApplication(class, class, =, null, ;) endTopLevelDeclaration(;) beginMetadataStar(abstract) endMetadataStar(0) - beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) + beginTopLevelMember(abstract) + handleRecoverableError(Message[Template(ExtraneousModifier), Can't have modifier 'abstract' here., Try removing 'abstract'., {lexeme: abstract}], abstract, abstract) + beginFields(DeclarationKind.TopLevel, null, abstract, null, null, null, null, null, ;) + handleRecoverableError(MissingConstFinalVarOrType, macro, macro) + handleNoType(abstract) + handleIdentifier(macro, topLevelVariableDeclaration) + handleNoFieldInitializer(class) + handleRecoverableError(Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}], macro, macro) + endTopLevelFields(null, abstract, null, null, null, null, null, 1, abstract, ;) + endTopLevelDeclaration(;) + beginMetadataStar(class) + endMetadataStar(0) + beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(abstract, abstract, macro, null, null, null, null, null, null, Class) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -63,6 +151,6 @@ beginCompilationUnit(macro) handleType(Mixin, null) endTypeList(1) handleNamedMixinApplicationWithClause(with) - endNamedMixinApplication(abstract, class, =, null, ;) + endNamedMixinApplication(class, class, =, null, ;) endTopLevelDeclaration(;) -endCompilationUnit(4, ) +endCompilationUnit(8, ) 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 fba0671f6f9..f4b2d7b74bf 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,17 +6,40 @@ parseUnit(macro) parseMetadataStar() listener: beginMetadataStar(macro) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(macro, , class, macro, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(macro, null, macro, null, null, null, null, null, null, class) - listener: beginClassOrMixinOrNamedMixinApplicationPrelude(macro) + parseTopLevelMemberImpl() + listener: beginTopLevelMember(macro) + isReservedKeyword(class) + indicatesMethodOrField(Class) + parseFields(, null, null, null, null, null, null, null, , NoType(), macro, DeclarationKind.TopLevel, null, false) + listener: beginFields(DeclarationKind.TopLevel, null, null, null, null, null, null, null, ) + reportRecoverableError(macro, MissingConstFinalVarOrType) + listener: handleRecoverableError(MissingConstFinalVarOrType, macro, macro) + listener: handleNoType() + ensureIdentifierPotentiallyRecovered(, topLevelVariableDeclaration, false) + listener: handleIdentifier(macro, topLevelVariableDeclaration) + parseFieldInitializerOpt(macro, macro, null, null, null, null, null, DeclarationKind.TopLevel, null) + listener: handleNoFieldInitializer(class) + ensureSemicolon(macro) + reportRecoverableError(macro, Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}]) + listener: handleRecoverableError(Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}], macro, macro) + rewriter() + listener: endTopLevelFields(null, null, null, null, null, null, null, 1, macro, ;) + listener: endTopLevelDeclaration(;) + parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.Declarations)) + parseMetadataStar(;) + listener: beginMetadataStar(class) + listener: endMetadataStar(0) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) + listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(macro, null, macro, null, null, null, null, null, null, Class) - parseClass(Class, macro, class, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) + parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) - parseClassHeaderOpt(Class, macro, class) + parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class, DeclarationHeaderKind.Class) listener: handleNoType(Class) listener: handleClassExtends(null, 1) @@ -24,28 +47,53 @@ parseUnit(macro) listener: handleClassNoWithClause() parseClassOrMixinOrEnumImplementsOpt(Class) listener: handleImplements(null, 0) - listener: handleClassHeader(macro, class, null) + listener: handleClassHeader(class, class, null) parseClassOrMixinOrExtensionBody(Class, DeclarationKind.Class, Class) listener: beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) notEofOrType(CLOSE_CURLY_BRACKET, }) listener: endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) - listener: endClassDeclaration(macro, }) + listener: endClassDeclaration(class, }) listener: endTopLevelDeclaration(}) parseTopLevelDeclarationImpl(}, DirectiveContext(DirectiveState.Declarations)) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, }, class, macro, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(abstract, abstract, macro, null, null, null, null, null, null, class) - listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) + parseTopLevelMemberImpl(}) + listener: beginTopLevelMember(abstract) + isReservedKeyword(class) + indicatesMethodOrField(Class) + reportRecoverableErrorWithToken(abstract, Template(ExtraneousModifier)) + listener: handleRecoverableError(Message[Template(ExtraneousModifier), Can't have modifier 'abstract' here., Try removing 'abstract'., {lexeme: abstract}], abstract, abstract) + parseFields(}, abstract, null, null, null, null, null, null, abstract, NoType(), macro, DeclarationKind.TopLevel, null, false) + listener: beginFields(DeclarationKind.TopLevel, null, abstract, null, null, null, null, null, }) + reportRecoverableError(macro, MissingConstFinalVarOrType) + listener: handleRecoverableError(MissingConstFinalVarOrType, macro, macro) + listener: handleNoType(abstract) + ensureIdentifierPotentiallyRecovered(abstract, topLevelVariableDeclaration, false) + listener: handleIdentifier(macro, topLevelVariableDeclaration) + parseFieldInitializerOpt(macro, macro, null, abstract, null, null, null, DeclarationKind.TopLevel, null) + listener: handleNoFieldInitializer(class) + ensureSemicolon(macro) + reportRecoverableError(macro, Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}]) + listener: handleRecoverableError(Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}], macro, macro) + rewriter() + listener: endTopLevelFields(null, abstract, null, null, null, null, null, 1, abstract, ;) + listener: endTopLevelDeclaration(;) + parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.Declarations)) + parseMetadataStar(;) + listener: beginMetadataStar(class) + listener: endMetadataStar(0) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) + listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, macro, null, null, null, null, null, null, Class) - parseClass(Class, abstract, class, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) + parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) - parseClassHeaderOpt(Class, abstract, class) + parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class, DeclarationHeaderKind.Class) listener: handleNoType(Class) listener: handleClassExtends(null, 1) @@ -53,25 +101,48 @@ parseUnit(macro) listener: handleClassNoWithClause() parseClassOrMixinOrEnumImplementsOpt(Class) listener: handleImplements(null, 0) - listener: handleClassHeader(abstract, class, null) + listener: handleClassHeader(class, class, null) parseClassOrMixinOrExtensionBody(Class, DeclarationKind.Class, Class) listener: beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) notEofOrType(CLOSE_CURLY_BRACKET, }) listener: endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) - listener: endClassDeclaration(abstract, }) + listener: endClassDeclaration(class, }) listener: endTopLevelDeclaration(}) parseTopLevelDeclarationImpl(}, DirectiveContext(DirectiveState.Declarations)) parseMetadataStar(}) listener: beginMetadataStar(macro) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(macro, }, class, macro, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(macro, null, macro, null, null, null, null, null, null, class) - listener: beginClassOrMixinOrNamedMixinApplicationPrelude(macro) + parseTopLevelMemberImpl(}) + listener: beginTopLevelMember(macro) + isReservedKeyword(class) + indicatesMethodOrField(Class) + parseFields(}, null, null, null, null, null, null, null, }, NoType(), macro, DeclarationKind.TopLevel, null, false) + listener: beginFields(DeclarationKind.TopLevel, null, null, null, null, null, null, null, }) + reportRecoverableError(macro, MissingConstFinalVarOrType) + listener: handleRecoverableError(MissingConstFinalVarOrType, macro, macro) + listener: handleNoType(}) + ensureIdentifierPotentiallyRecovered(}, topLevelVariableDeclaration, false) + listener: handleIdentifier(macro, topLevelVariableDeclaration) + parseFieldInitializerOpt(macro, macro, null, null, null, null, null, DeclarationKind.TopLevel, null) + listener: handleNoFieldInitializer(class) + ensureSemicolon(macro) + reportRecoverableError(macro, Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}]) + listener: handleRecoverableError(Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}], macro, macro) + rewriter() + listener: endTopLevelFields(null, null, null, null, null, null, null, 1, macro, ;) + listener: endTopLevelDeclaration(;) + parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.Declarations)) + parseMetadataStar(;) + listener: beginMetadataStar(class) + listener: endMetadataStar(0) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) + listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(macro, null, macro, null, null, null, null, null, null, Class) - parseNamedMixinApplication(Class, macro, class) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) + parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) listener: handleType(Object, null) @@ -84,20 +155,45 @@ parseUnit(macro) listener: endTypeList(1) listener: handleNamedMixinApplicationWithClause(with) ensureSemicolon(Mixin) - listener: endNamedMixinApplication(macro, class, =, null, ;) + listener: endNamedMixinApplication(class, class, =, null, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.Declarations)) parseMetadataStar(;) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, ;, class, macro, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(abstract, abstract, macro, null, null, null, null, null, null, class) - listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) + parseTopLevelMemberImpl(;) + listener: beginTopLevelMember(abstract) + isReservedKeyword(class) + indicatesMethodOrField(Class) + reportRecoverableErrorWithToken(abstract, Template(ExtraneousModifier)) + listener: handleRecoverableError(Message[Template(ExtraneousModifier), Can't have modifier 'abstract' here., Try removing 'abstract'., {lexeme: abstract}], abstract, abstract) + parseFields(;, abstract, null, null, null, null, null, null, abstract, NoType(), macro, DeclarationKind.TopLevel, null, false) + listener: beginFields(DeclarationKind.TopLevel, null, abstract, null, null, null, null, null, ;) + reportRecoverableError(macro, MissingConstFinalVarOrType) + listener: handleRecoverableError(MissingConstFinalVarOrType, macro, macro) + listener: handleNoType(abstract) + ensureIdentifierPotentiallyRecovered(abstract, topLevelVariableDeclaration, false) + listener: handleIdentifier(macro, topLevelVariableDeclaration) + parseFieldInitializerOpt(macro, macro, null, abstract, null, null, null, DeclarationKind.TopLevel, null) + listener: handleNoFieldInitializer(class) + ensureSemicolon(macro) + reportRecoverableError(macro, Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}]) + listener: handleRecoverableError(Message[Template(ExpectedAfterButGot), Expected ';' after this., null, {expected: ;}], macro, macro) + rewriter() + listener: endTopLevelFields(null, abstract, null, null, null, null, null, 1, abstract, ;) + listener: endTopLevelDeclaration(;) + parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.Declarations)) + parseMetadataStar(;) + listener: beginMetadataStar(class) + listener: endMetadataStar(0) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) + listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(abstract, abstract, macro, null, null, null, null, null, null, Class) - parseNamedMixinApplication(Class, abstract, class) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, Class) + parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) listener: handleType(Object, null) @@ -110,7 +206,7 @@ parseUnit(macro) listener: endTypeList(1) listener: handleNamedMixinApplicationWithClause(with) ensureSemicolon(Mixin) - listener: endNamedMixinApplication(abstract, class, =, null, ;) + listener: endNamedMixinApplication(class, class, =, null, ;) listener: endTopLevelDeclaration(;) reportAllErrorTokens(macro) - listener: endCompilationUnit(4, ) + listener: endCompilationUnit(8, ) diff --git a/pkg/front_end/parser_testcases/macros/macro_class.dart.parser.expect b/pkg/front_end/parser_testcases/macros/macro_class.dart.parser.expect index cdcf2eb859e..4a096ee510b 100644 --- a/pkg/front_end/parser_testcases/macros/macro_class.dart.parser.expect +++ b/pkg/front_end/parser_testcases/macros/macro_class.dart.parser.expect @@ -1,9 +1,11 @@ -macro class Class {} -abstract macro class Class {} -macro class Class = Object with Mixin; -abstract macro class Class = Object with Mixin; +NOTICE: Stream was rewritten by parser! -macro[StringToken] class[KeywordToken] Class[StringToken] {[BeginToken]}[SimpleToken] -abstract[KeywordToken] macro[StringToken] class[KeywordToken] Class[StringToken] {[BeginToken]}[SimpleToken] -macro[StringToken] class[KeywordToken] Class[StringToken] =[SimpleToken] Object[StringToken] with[KeywordToken] Mixin[StringToken];[SimpleToken] -abstract[KeywordToken] macro[StringToken] class[KeywordToken] Class[StringToken] =[SimpleToken] Object[StringToken] with[KeywordToken] Mixin[StringToken];[SimpleToken][SimpleToken] +macro ;class Class {} +abstract macro ;class Class {} +macro ;class Class = Object with Mixin; +abstract macro ;class Class = Object with Mixin; + +macro[StringToken] ;[SyntheticToken]class[KeywordToken] Class[StringToken] {[BeginToken]}[SimpleToken] +abstract[KeywordToken] macro[StringToken] ;[SyntheticToken]class[KeywordToken] Class[StringToken] {[BeginToken]}[SimpleToken] +macro[StringToken] ;[SyntheticToken]class[KeywordToken] Class[StringToken] =[SimpleToken] Object[StringToken] with[KeywordToken] Mixin[StringToken];[SimpleToken] +abstract[KeywordToken] macro[StringToken] ;[SyntheticToken]class[KeywordToken] Class[StringToken] =[SimpleToken] Object[StringToken] with[KeywordToken] Mixin[StringToken];[SimpleToken][SimpleToken] 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 9e3fa010cd3..4f1f29f3557 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, null, null, null, null, C) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -171,7 +171,7 @@ beginCompilationUnit(abstract) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, null, Bar) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Bar) handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) handleNoType(Bar) handleClassExtends(null, 1) 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 43d7e530488..5a9a51aa2c8 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(abstract, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(abstract, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, C) parseClass(C, abstract, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -211,13 +211,13 @@ parseUnit(abstract) parseMetadataStar(;) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(abstract, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Bar, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, null, Bar) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Bar) parseClass(Bar, abstract, class, null, Bar) parsePrimaryConstructorOpt(DeclarationKind.Class, Bar, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) 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 98af6be1ebe..6594b95addb 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 1e42d4e7b39..03f14730407 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 @@ -46,13 +46,13 @@ parseUnit(final) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect index 789864162e3..f035831d16a 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 1f47028756b..cb9b8cd6097 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, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 74348197653..f9202a4ad19 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 ec48198a322..4b239437229 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) 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 96d3d7c4bc5..199fad93881 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, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, null, A) handleNoPrimaryConstructor(DeclarationKind.Class, A, null) handleNoType(A) handleClassExtends(null, 1) 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 b05c712d29f..21c3fd1ee80 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, A) parseClass(A, class, class, null, A) parsePrimaryConstructorOpt(DeclarationKind.Class, A, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, A, null) 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 7d3679a1e3b..5b917cbedc9 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, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, null, X) handleNoPrimaryConstructor(DeclarationKind.Class, X, null) handleNoType(X) handleClassExtends(null, 1) 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 3dc9dbce4e9..5887ae5f242 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, X) parseClass(X, class, class, null, X) parsePrimaryConstructorOpt(DeclarationKind.Class, X, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, X, null) 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 3a6cb6f7607..61cff2c4b28 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, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, null, X) handleNoPrimaryConstructor(DeclarationKind.Class, X, null) handleNoType(X) handleClassExtends(null, 1) 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 87868a85677..67e0f596774 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, X) parseClass(X, class, class, null, X) parsePrimaryConstructorOpt(DeclarationKind.Class, X, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, X, null) 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 0f9403e42ec..7b6d610b171 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 c8cb446fae3..37678824f29 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 5b89bc089ad..225900d59fd 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 501f4131a3e..131dc17f05e 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 faf607ea068..43af2240849 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 10c5644999e..03a3ff7a98e 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 da9828a9f5d..a830a445349 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 b553a097f81..d1fa35b9a30 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 831f22be205..0d251830f65 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 4f17dbcd7fc..78ea9348637 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 93d121a0cbd..d50735d57bc 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 abf6d467999..e97a505c1d5 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 555574b8692..f11adf0a1ff 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect @@ -75,7 +75,7 @@ beginCompilationUnit(bool) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 38c01ecabb6..bc11719d02a 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 @@ -192,13 +192,13 @@ parseUnit(bool) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 d3329242207..8e9d8838822 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect @@ -310,7 +310,7 @@ beginCompilationUnit(Order) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Order, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Order) + beginClassDeclaration(class, null, null, null, null, null, null, null, Order) handleNoPrimaryConstructor(DeclarationKind.Class, Order, null) handleNoType(Order) handleClassExtends(null, 1) 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 6509b08ffe7..81109f6d88d 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 @@ -645,13 +645,13 @@ parseUnit(Order) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Order) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Order) parseClass(Order, class, class, null, Order) parsePrimaryConstructorOpt(DeclarationKind.Class, Order, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Order, null) 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 8ac3681f744..6f3125d60e6 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 9d7f1c0e9f4..4ac30b24c7f 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 19c4070f2ff..cff1b389c3a 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 77dcd5ba309..fc4d2b13a7c 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 544671e84ab..9905533dca0 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 6d76202519f..ee5f3a4aafe 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 cb98d407ecc..991ac3f6e2f 100644 --- a/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect @@ -124,7 +124,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, null, X) handleNoPrimaryConstructor(DeclarationKind.Class, X, null) handleNoType(X) handleClassExtends(null, 1) @@ -164,7 +164,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, null, Y) handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) handleNoType(Y) handleClassExtends(null, 1) 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 23a2a634c6b..889f6e78533 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 @@ -330,13 +330,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, X) parseClass(X, class, class, null, X) parsePrimaryConstructorOpt(DeclarationKind.Class, X, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, X, null) @@ -421,13 +421,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Y) parseClass(Y, class, class, null, Y) parsePrimaryConstructorOpt(DeclarationKind.Class, Y, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) 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 29b455ea4e8..0049d63a0c1 100644 --- a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect @@ -142,7 +142,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, null, X) handleNoPrimaryConstructor(DeclarationKind.Class, X, null) handleNoType(X) handleClassExtends(null, 1) @@ -182,7 +182,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, null, Y) handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) handleNoType(Y) handleClassExtends(null, 1) 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 d75fce5da5e..6ef5b46fe96 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 @@ -381,13 +381,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, X) parseClass(X, class, class, null, X) parsePrimaryConstructorOpt(DeclarationKind.Class, X, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, X, null) @@ -472,13 +472,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Y) parseClass(Y, class, class, null, Y) parsePrimaryConstructorOpt(DeclarationKind.Class, Y, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) 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 88995bfb8dc..f3431f796a4 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, null, null, null, null, Class1) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class1) handleNoPrimaryConstructor(DeclarationKind.Class, Class1, null) handleNoType(Class1) handleClassExtends(null, 1) 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 6eb496b5c4b..87b56cd2033 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Class1) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class1) parseClass(Class1, class, class, null, Class1) parsePrimaryConstructorOpt(DeclarationKind.Class, Class1, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class1, null) 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 297db8a8ab9..0547fd9d2a1 100644 --- a/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect @@ -124,7 +124,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, null, X) handleNoPrimaryConstructor(DeclarationKind.Class, X, null) handleNoType(X) handleClassExtends(null, 1) @@ -164,7 +164,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, null, Y) handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) handleNoType(Y) handleClassExtends(null, 1) 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 59c5f035fc3..129492f2b85 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 @@ -330,13 +330,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, X) parseClass(X, class, class, null, X) parsePrimaryConstructorOpt(DeclarationKind.Class, X, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, X, null) @@ -421,13 +421,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Y) parseClass(Y, class, class, null, Y) parsePrimaryConstructorOpt(DeclarationKind.Class, Y, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) 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 4396a2806ef..fe9d8be5374 100644 --- a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect @@ -135,7 +135,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, null, X) handleNoPrimaryConstructor(DeclarationKind.Class, X, null) handleNoType(X) handleClassExtends(null, 1) @@ -175,7 +175,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, null, Y) handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) handleNoType(Y) handleClassExtends(null, 1) 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 547d8e9e037..0b730bdf672 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 @@ -346,13 +346,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, X) parseClass(X, class, class, null, X) parsePrimaryConstructorOpt(DeclarationKind.Class, X, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, X, null) @@ -437,13 +437,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Y) parseClass(Y, class, class, null, Y) parsePrimaryConstructorOpt(DeclarationKind.Class, Y, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Y, null) 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 fd99fb339da..8227d7f11af 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 cd01e43f907..910dd48de36 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect index a63e5e3dd93..ada6ce14616 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 90458502ad4..8520c1cd48f 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect index 6076d996527..182e69a2c40 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 @@ -96,7 +96,7 @@ beginCompilationUnit(extension) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleIdentifier(List, typeReference) beginTypeArguments(<) 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 6c8f204b192..ebef32a28d7 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, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) @@ -206,13 +206,13 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(abstract, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(abstract, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Foo) parseClass(Foo, abstract, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 25e7e914fd7..4d92fbfabeb 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 0858ea5e60d..c0b7d082334 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 ec5afd54fb3..0080b28c3d6 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 65f7f6ab5e0..13b851190c0 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect index a3f9a303666..e47e1cc2f60 100644 --- a/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect @@ -217,7 +217,7 @@ beginCompilationUnit(import) handleImportPrefix(null, as) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(const) endMetadataStar(0) @@ -251,7 +251,7 @@ beginCompilationUnit(import) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) @@ -1766,7 +1766,7 @@ beginCompilationUnit(import) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, GenericClass) + beginClassDeclaration(class, null, null, null, null, null, null, null, GenericClass) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/patterns/const_patterns.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.intertwined.expect index e9bab61be17..72bb0157039 100644 --- a/pkg/front_end/parser_testcases/patterns/const_patterns.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -25,7 +25,7 @@ parseUnit(import) parseCombinatorStar(prefix) listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) @@ -84,13 +84,13 @@ parseUnit(import) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -3193,8 +3193,8 @@ parseUnit(import) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(GenericClass, classOrMixinDeclaration) @@ -3207,7 +3207,7 @@ parseUnit(import) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, GenericClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, GenericClass) parseClass(>, class, class, null, GenericClass) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) diff --git a/pkg/front_end/parser_testcases/patterns/const_patterns_binary.dart.expect b/pkg/front_end/parser_testcases/patterns/const_patterns_binary.dart.expect index 805dbeffffb..da95d4f7858 100644 --- a/pkg/front_end/parser_testcases/patterns/const_patterns_binary.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/const_patterns_binary.dart.expect @@ -273,7 +273,7 @@ beginCompilationUnit(import) handleImportPrefix(null, as) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(const) endMetadataStar(0) @@ -291,7 +291,7 @@ beginCompilationUnit(import) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/patterns/const_patterns_binary.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/const_patterns_binary.dart.intertwined.expect index 5d91bca0eac..3d90e3eb600 100644 --- a/pkg/front_end/parser_testcases/patterns/const_patterns_binary.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/const_patterns_binary.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(import, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -25,7 +25,7 @@ parseUnit(import) parseCombinatorStar(prefix) listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) @@ -55,13 +55,13 @@ parseUnit(import) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) 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 23fef599e1d..43497b86363 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 cd9a9f5f33f..5ca0cbf71fa 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 af562e831dc..ad82a5e8727 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 d32861e17ef..163aae59310 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 c7e581fc735..0aba5002e25 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 105044b15b0..0a6fdcf73a4 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 241a0fc3e0c..12414a8e050 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) 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 a1f67b8dbc3..286c1e45f27 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) 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 4529f8a852f..8719d8ba789 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) 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 fac41019707..a5d26c04dfb 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) diff --git a/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect b/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect index 32ca474009a..af65868ff4d 100644 --- a/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/patterns/issue_51169.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/issue_51169.dart.intertwined.expect index 27c6ec3cd65..41f7865c198 100644 --- a/pkg/front_end/parser_testcases/patterns/issue_51169.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/issue_51169.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Class) parseClass(Class, class, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) 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 22b42503e9f..47239ae41f8 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 238cfff8bd3..4e1fcb5e96a 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 06520847d26..95128badd70 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 b8f755f12cd..74cbe758607 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 ab37ea9d531..994cc31f708 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 4a106ca2c3e..1ca237dfdb4 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 40812e020dc..9fb7df0082b 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 164894f2879..6b03f9d197a 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.expect b/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.expect index ff8c9b3db37..ca87c535ff0 100644 --- a/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.expect @@ -12,7 +12,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.intertwined.expect index a78873a7427..0600b167730 100644 --- a/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.intertwined.expect @@ -6,8 +6,8 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclaration_inClass.dart.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclaration_inClass.dart.expect index 2899f425671..64f2d6018b9 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclaration_inClass.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclaration_inClass.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclaration_inClass.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclaration_inClass.dart.intertwined.expect index b707657c086..bfd97d6091e 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclaration_inClass.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclaration_inClass.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.expect index b16309ee13b..9d28c56fcbc 100644 --- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.expect @@ -11,7 +11,7 @@ beginCompilationUnit(import) handleImportPrefix(null, as) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(test) endMetadataStar(0) 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 8d7ed3312c0..a005c09b5ec 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, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -25,7 +25,7 @@ parseUnit(import) parseCombinatorStar(async) listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.expect index 60cb5b600ab..313880716fd 100644 --- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.expect @@ -11,7 +11,7 @@ beginCompilationUnit(import) handleImportPrefix(null, as) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(test) endMetadataStar(0) 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 1e3dabdbdb1..8c1e9882e03 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, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -25,7 +25,7 @@ parseUnit(import) parseCombinatorStar(async) listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.expect index 297c71c7838..3cf70196fb2 100644 --- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.expect @@ -11,7 +11,7 @@ beginCompilationUnit(import) handleImportPrefix(null, as) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(test) endMetadataStar(0) 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 4b2a684b629..b6fd2e4b061 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, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -25,7 +25,7 @@ parseUnit(import) parseCombinatorStar(async) listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.expect index 751a1475308..7f4c5facb8d 100644 --- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.expect @@ -11,7 +11,7 @@ beginCompilationUnit(import) handleImportPrefix(null, as) beginCombinators(;) endCombinators(0) - endImport(import, null, ;) + endImport(import, ;) endTopLevelDeclaration(;) beginMetadataStar(test) endMetadataStar(0) 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 3432780377b..70c52ccf16e 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, , import, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(import, , import, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -25,7 +25,7 @@ parseUnit(import) parseCombinatorStar(async) listener: beginCombinators(;) listener: endCombinators(0) - listener: endImport(import, null, ;) + listener: endImport(import, ;) listener: endTopLevelDeclaration(;) parseTopLevelDeclarationImpl(;, DirectiveContext(DirectiveState.ImportAndExport)) parseMetadataStar(;) 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 4e435899234..d80f87d204f 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 8099b56af66..7d17d9556c3 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.expect index a53fbb01847..3f4bc0cfbc9 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -23,7 +23,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -50,7 +50,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -77,7 +77,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -104,7 +104,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -132,7 +132,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) diff --git a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.intertwined.expect index f12e0f1b23b..ccf58000d3e 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -40,13 +40,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -74,8 +74,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -88,7 +88,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -116,8 +116,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -130,7 +130,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -158,8 +158,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -172,7 +172,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -202,8 +202,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -216,7 +216,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) diff --git a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.expect index debbfd83a7f..5e71f75e93f 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C1, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C1) + beginClassDeclaration(class, null, null, null, null, null, null, null, C1) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -33,7 +33,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C2, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C2) + beginClassDeclaration(class, null, null, null, null, null, null, null, C2) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -71,7 +71,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C3, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C3) + beginClassDeclaration(class, null, null, null, null, null, null, null, C3) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -99,7 +99,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C4, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C4) + beginClassDeclaration(class, null, null, null, null, null, null, null, C4) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) diff --git a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.intertwined.expect index 6920be92752..6840389ec4f 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C1, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C1) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C1) parseClass(C1, class, class, null, C1) parsePrimaryConstructorOpt(DeclarationKind.Class, C1, null) listener: beginPrimaryConstructor(() @@ -60,13 +60,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C2, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C2) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C2) parseClass(C2, class, class, null, C2) parsePrimaryConstructorOpt(DeclarationKind.Class, C2, null) listener: beginPrimaryConstructor(() @@ -137,13 +137,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C3, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C3) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C3) parseClass(C3, class, class, null, C3) parsePrimaryConstructorOpt(DeclarationKind.Class, C3, null) listener: beginPrimaryConstructor(() @@ -189,13 +189,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C4, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C4) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C4) parseClass(C4, class, class, null, C4) parsePrimaryConstructorOpt(DeclarationKind.Class, C4, null) listener: beginPrimaryConstructor(() diff --git a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.expect index 9114bdfc3d5..5b8f819e411 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.expect @@ -58,7 +58,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C1, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C1) + beginClassDeclaration(class, null, null, null, null, null, null, null, C1) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -93,7 +93,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C2, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C2) + beginClassDeclaration(class, null, null, null, null, null, null, null, C2) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -147,7 +147,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C3, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C3) + beginClassDeclaration(class, null, null, null, null, null, null, null, C3) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -181,7 +181,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C4, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C4) + beginClassDeclaration(class, null, null, null, null, null, null, null, C4) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -234,7 +234,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C5, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C5) + beginClassDeclaration(class, null, null, null, null, null, null, null, C5) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -263,7 +263,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C6, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C6) + beginClassDeclaration(class, null, null, null, null, null, null, null, C6) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -292,7 +292,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C7, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C7) + beginClassDeclaration(class, null, null, null, null, null, null, null, C7) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -321,7 +321,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C8, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C8) + beginClassDeclaration(class, null, null, null, null, null, null, null, C8) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -350,7 +350,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C9, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C9) + beginClassDeclaration(class, null, null, null, null, null, null, null, C9) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -379,7 +379,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C10, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C10) + beginClassDeclaration(class, null, null, null, null, null, null, null, C10) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -408,7 +408,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C11, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C11) + beginClassDeclaration(class, null, null, null, null, null, null, null, C11) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) diff --git a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.intertwined.expect index 79c26d21a31..8ed99ce3127 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C1, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C1) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C1) parseClass(C1, class, class, null, C1) parsePrimaryConstructorOpt(DeclarationKind.Class, C1, null) listener: beginPrimaryConstructor(() @@ -73,13 +73,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C2, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C2) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C2) parseClass(C2, class, class, null, C2) parsePrimaryConstructorOpt(DeclarationKind.Class, C2, null) listener: beginPrimaryConstructor(() @@ -177,13 +177,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C3, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C3) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C3) parseClass(C3, class, class, null, C3) parsePrimaryConstructorOpt(DeclarationKind.Class, C3, null) listener: beginPrimaryConstructor(() @@ -242,13 +242,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C4, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C4) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C4) parseClass(C4, class, class, null, C4) parsePrimaryConstructorOpt(DeclarationKind.Class, C4, null) listener: beginPrimaryConstructor(() @@ -344,13 +344,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C5, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C5) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C5) parseClass(C5, class, class, null, C5) parsePrimaryConstructorOpt(DeclarationKind.Class, C5, null) listener: beginPrimaryConstructor(() @@ -398,13 +398,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C6, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C6) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C6) parseClass(C6, class, class, null, C6) parsePrimaryConstructorOpt(DeclarationKind.Class, C6, null) listener: beginPrimaryConstructor(() @@ -452,13 +452,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C7, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C7) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C7) parseClass(C7, class, class, null, C7) parsePrimaryConstructorOpt(DeclarationKind.Class, C7, null) listener: beginPrimaryConstructor(() @@ -506,13 +506,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C8, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C8) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C8) parseClass(C8, class, class, null, C8) parsePrimaryConstructorOpt(DeclarationKind.Class, C8, null) listener: beginPrimaryConstructor(() @@ -561,13 +561,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C9, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C9) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C9) parseClass(C9, class, class, null, C9) parsePrimaryConstructorOpt(DeclarationKind.Class, C9, null) listener: beginPrimaryConstructor(() @@ -615,13 +615,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C10, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C10) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C10) parseClass(C10, class, class, null, C10) parsePrimaryConstructorOpt(DeclarationKind.Class, C10, null) listener: beginPrimaryConstructor(() @@ -669,13 +669,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C11, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C11) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C11) parseClass(C11, class, class, null, C11) parsePrimaryConstructorOpt(DeclarationKind.Class, C11, null) listener: beginPrimaryConstructor(() diff --git a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.expect index 0fd4dc2ca15..dc3a50b0d89 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.expect @@ -62,7 +62,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginOptionalFormalParameters({) @@ -92,7 +92,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleRecoverableError(Message[Template(ExpectedIdentifier), Expected an identifier, but got '{'., Try inserting an identifier before '{'., {lexeme: {}], {, {) handleIdentifier(, primaryConstructorDeclaration) @@ -112,7 +112,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleRecoverableError(Message[Template(ExpectedIdentifier), Expected an identifier, but got '('., Try inserting an identifier before '('., {lexeme: (}], (, () handleIdentifier(, primaryConstructorDeclaration) @@ -133,7 +133,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleRecoverableError(ConstWithoutPrimaryConstructor, const, const) handleNoPrimaryConstructor(DeclarationKind.Class, C, const) handleNoType(C) @@ -158,7 +158,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginOptionalFormalParameters({) @@ -196,7 +196,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleRecoverableError(ConstWithoutPrimaryConstructor, const, const) handleNoPrimaryConstructor(DeclarationKind.Class, >, const) handleNoType(>) @@ -221,7 +221,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleRecoverableError(Message[Template(ExpectedIdentifier), Expected an identifier, but got '{'., Try inserting an identifier before '{'., {lexeme: {}], {, {) handleIdentifier(, primaryConstructorDeclaration) @@ -249,7 +249,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleRecoverableError(Message[Template(ExpectedIdentifier), Expected an identifier, but got '('., Try inserting an identifier before '('., {lexeme: (}], (, () handleIdentifier(, primaryConstructorDeclaration) @@ -278,7 +278,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleRecoverableError(Message[Template(ExpectedIdentifier), Expected an identifier, but got '{'., Try inserting an identifier before '{'., {lexeme: {}], {, {) handleIdentifier(, primaryConstructorDeclaration) @@ -306,7 +306,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleRecoverableError(Message[Template(ExpectedIdentifier), Expected an identifier, but got '('., Try inserting an identifier before '('., {lexeme: (}], (, () handleIdentifier(, primaryConstructorDeclaration) @@ -335,7 +335,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) handleNoFormalParameters(named, MemberKind.PrimaryConstructor) @@ -362,7 +362,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -390,7 +390,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) handleNoFormalParameters(named, MemberKind.PrimaryConstructor) @@ -410,7 +410,7 @@ beginCompilationUnit(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(=) handleRecoverableError(ConstWithoutPrimaryConstructor, const, const) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, C) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, C) handleIdentifier(O, typeReference) handleNoTypeArguments(with) handleType(O, null) @@ -436,7 +436,7 @@ beginCompilationUnit(class) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) handleRecoverableError(ConstWithoutPrimaryConstructor, const, const) - beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, C) + beginNamedMixinApplication(class, null, null, null, null, null, null, null, C) handleIdentifier(O, typeReference) handleNoTypeArguments(with) handleType(O, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.intertwined.expect index dfd4b5cdd44..7940c59217d 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -60,13 +60,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -97,13 +97,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -137,13 +137,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) reportRecoverableError(const, ConstWithoutPrimaryConstructor) @@ -168,8 +168,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -182,7 +182,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -230,8 +230,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -244,7 +244,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) reportRecoverableError(const, ConstWithoutPrimaryConstructor) @@ -269,8 +269,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -283,7 +283,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -314,8 +314,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -328,7 +328,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -362,8 +362,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -376,7 +376,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -407,8 +407,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -421,7 +421,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -455,8 +455,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -469,7 +469,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -496,8 +496,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -510,7 +510,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -540,8 +540,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -554,7 +554,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -581,15 +581,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(=) reportRecoverableError(const, ConstWithoutPrimaryConstructor) listener: handleRecoverableError(ConstWithoutPrimaryConstructor, const, const) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, C) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, C) parseNamedMixinApplication(C, class, class) listener: handleIdentifier(O, typeReference) listener: handleNoTypeArguments(with) @@ -609,8 +609,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -625,7 +625,7 @@ parseUnit(class) listener: endTypeVariables(<, >) reportRecoverableError(const, ConstWithoutPrimaryConstructor) listener: handleRecoverableError(ConstWithoutPrimaryConstructor, const, const) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, null, C) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null, C) parseNamedMixinApplication(>, class, class) listener: handleIdentifier(O, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.expect index 836237bc344..ab785263dac 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.intertwined.expect index bb61daf54f2..d25452d5c52 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.expect index 227e52cfc81..de09ae09f9b 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.expect @@ -58,7 +58,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.intertwined.expect index 23d2fefe6e2..78e9c2baec9 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.expect index e8e186f97b5..61317d048d1 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.expect @@ -70,7 +70,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.intertwined.expect index d589c40fc58..16cc0df6839 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.expect index d7adc30a621..fe3be4a4260 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -23,7 +23,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(a) @@ -49,7 +49,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(a) @@ -77,7 +77,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -103,7 +103,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -129,7 +129,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -157,7 +157,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -185,7 +185,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -216,7 +216,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -247,7 +247,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -278,7 +278,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -309,7 +309,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -348,7 +348,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -387,7 +387,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -426,7 +426,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) diff --git a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.intertwined.expect index 33c33cd311d..7b5f75eb5a3 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -40,13 +40,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -84,13 +84,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -130,13 +130,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -174,13 +174,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -218,13 +218,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -264,13 +264,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -310,13 +310,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -361,13 +361,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -412,13 +412,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -463,13 +463,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -514,13 +514,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -573,13 +573,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -632,13 +632,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -691,13 +691,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -750,7 +750,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -779,7 +779,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -818,7 +818,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -859,7 +859,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -898,7 +898,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -937,7 +937,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -978,7 +978,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1019,7 +1019,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1065,7 +1065,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1111,7 +1111,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1157,7 +1157,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1203,7 +1203,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1257,7 +1257,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1311,7 +1311,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1365,7 +1365,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1419,7 +1419,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1444,7 +1444,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1479,7 +1479,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1516,7 +1516,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1551,7 +1551,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1586,7 +1586,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1623,7 +1623,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1660,7 +1660,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1702,7 +1702,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1744,7 +1744,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1786,7 +1786,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1828,7 +1828,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1878,7 +1878,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1928,7 +1928,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1978,7 +1978,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.expect index 3074d35075d..849aeb02712 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.expect @@ -151,7 +151,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -193,7 +193,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(covariant) @@ -220,7 +220,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(covariant) @@ -249,7 +249,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(covariant) @@ -275,7 +275,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(covariant) @@ -302,7 +302,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(covariant) @@ -330,7 +330,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(covariant) @@ -359,7 +359,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(const) @@ -391,7 +391,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(const) @@ -431,7 +431,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(const) @@ -463,7 +463,7 @@ beginCompilationUnit(m) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(const) diff --git a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.intertwined.expect index 786f30dcec3..18fad865cc9 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.intertwined.expect @@ -50,13 +50,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -127,13 +127,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -173,13 +173,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -221,13 +221,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -265,13 +265,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -311,13 +311,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -357,13 +357,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -405,13 +405,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -458,13 +458,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -519,13 +519,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -572,13 +572,13 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -633,7 +633,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -674,7 +674,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -717,7 +717,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -756,7 +756,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -797,7 +797,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -838,7 +838,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -881,7 +881,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -929,7 +929,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -985,7 +985,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1033,7 +1033,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1089,7 +1089,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1174,7 +1174,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1211,7 +1211,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1250,7 +1250,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1285,7 +1285,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1322,7 +1322,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1359,7 +1359,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1398,7 +1398,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1442,7 +1442,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1494,7 +1494,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1538,7 +1538,7 @@ parseUnit(m) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.expect index 7a43a49ead5..af98fab803b 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.expect @@ -138,7 +138,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -157,7 +157,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(a) @@ -183,7 +183,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(a) @@ -211,7 +211,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -237,7 +237,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -263,7 +263,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -292,7 +292,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -320,7 +320,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -352,7 +352,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -384,7 +384,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -417,7 +417,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -449,7 +449,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -489,7 +489,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) @@ -529,7 +529,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(var) @@ -570,7 +570,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) beginMetadataStar(final) diff --git a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.intertwined.expect index 8c8731f7261..ab050130420 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -40,13 +40,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -84,13 +84,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -130,13 +130,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -174,13 +174,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -218,13 +218,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -266,13 +266,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -312,13 +312,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -365,13 +365,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -418,13 +418,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -473,13 +473,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -526,13 +526,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -587,13 +587,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -648,13 +648,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -711,13 +711,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -772,7 +772,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -801,7 +801,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -840,7 +840,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -881,7 +881,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -920,7 +920,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -959,7 +959,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1002,7 +1002,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1043,7 +1043,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1091,7 +1091,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1139,7 +1139,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1189,7 +1189,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1237,7 +1237,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1293,7 +1293,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1349,7 +1349,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1407,7 +1407,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -1463,7 +1463,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1488,7 +1488,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1523,7 +1523,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1560,7 +1560,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1595,7 +1595,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1630,7 +1630,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1669,7 +1669,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1706,7 +1706,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1750,7 +1750,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1794,7 +1794,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1840,7 +1840,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1884,7 +1884,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1936,7 +1936,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -1988,7 +1988,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -2042,7 +2042,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.intertwined.expect index 5dd39a881b8..254405988d8 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -35,7 +35,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -64,7 +64,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -101,7 +101,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -138,7 +138,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -177,7 +177,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.intertwined.expect index 8732aa340b9..3ec74ae179c 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -69,7 +69,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -155,7 +155,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -216,7 +216,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.intertwined.expect index da823b43ebc..a49ee94befb 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -55,7 +55,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -131,7 +131,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -179,7 +179,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -255,7 +255,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -301,7 +301,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.intertwined.expect index 3214bd28d97..a036fa4027f 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(enum, , enum, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -55,7 +55,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -87,7 +87,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -122,7 +122,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -148,7 +148,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -205,7 +205,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -239,7 +239,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -279,7 +279,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -322,7 +322,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -362,7 +362,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) @@ -405,7 +405,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -441,7 +441,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -480,7 +480,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(const, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.intertwined.expect index 7bf1d1af71d..d12d165bbe8 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -31,7 +31,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -56,7 +56,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -89,7 +89,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -122,7 +122,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -157,7 +157,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.intertwined.expect index f7d885ca2d2..05b9d11a18c 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -63,7 +63,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -143,7 +143,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -198,7 +198,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect index 8a8def9ef17..0c9662fa5e1 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -86,7 +86,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -191,7 +191,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -271,7 +271,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.intertwined.expect index 8e62ac3c57a..a77578678db 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -51,7 +51,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -81,7 +81,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -112,7 +112,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -134,7 +134,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -187,7 +187,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -217,7 +217,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -255,7 +255,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -294,7 +294,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -332,7 +332,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -371,7 +371,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -405,7 +405,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -440,7 +440,7 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.expect index 5bc95d2df75..397a9623dd2 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.intertwined.expect index 33810c3e5ab..7d833a544b8 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.expect index 3b4907680ef..59bb27d0ce4 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.expect @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.intertwined.expect index 95e4bc467fb..ca123e5aec9 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.expect index fbf118ce3fe..213c0ccf157 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.expect @@ -54,7 +54,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.intertwined.expect index fa75537d60a..f8e170bca1f 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/new_dot_name.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/new_dot_name.dart.expect index 9ee486713ee..81c132b67a0 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/new_dot_name.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/new_dot_name.dart.expect @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/new_dot_name.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/new_dot_name.dart.intertwined.expect index 74be299f925..3261ee0c1d2 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/new_dot_name.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/new_dot_name.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -100,7 +100,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(enum, }, enum, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseEnum(enum, null, enum) listener: beginEnumDeclarationPrelude(enum) ensureIdentifier(enum, enumDeclaration) @@ -203,7 +203,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.expect index 95c6660abb8..7f2ed25aca4 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.expect @@ -310,7 +310,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.intertwined.expect index cbc6934e416..ae59d795667 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.expect index b27779daeb2..661a1cb1682 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.expect @@ -38,7 +38,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.intertwined.expect index 14440eb558f..ff9629a85ab 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.expect index 6ddcb63ceda..a0b229eda3a 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.expect @@ -38,7 +38,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.intertwined.expect index 260eea41af7..8afd7e1e16f 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.expect index 3ee3c7a07fc..9c7875843ae 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(;) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -19,7 +19,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(O, typeReference) handleNoTypeArguments(;) @@ -36,7 +36,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(O, typeReference) handleNoTypeArguments(implements) @@ -56,7 +56,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(O, typeReference) handleNoTypeArguments(with) @@ -81,7 +81,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(O, typeReference) handleNoTypeArguments(with) @@ -103,7 +103,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(implements) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -121,7 +121,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(with) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -144,7 +144,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(with) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -172,7 +172,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -195,7 +195,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleIdentifier(O, typeReference) beginTypeArguments(<) @@ -224,7 +224,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleIdentifier(O, typeReference) beginTypeArguments(<) @@ -260,7 +260,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleIdentifier(O, typeReference) beginTypeArguments(<) @@ -305,7 +305,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleIdentifier(O, typeReference) beginTypeArguments(<) @@ -343,7 +343,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -373,7 +373,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -412,7 +412,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -436,7 +436,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -454,7 +454,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -474,7 +474,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -497,7 +497,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -525,7 +525,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -550,7 +550,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -571,7 +571,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -597,7 +597,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -628,7 +628,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -654,7 +654,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -686,7 +686,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -725,7 +725,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -773,7 +773,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -814,7 +814,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -847,7 +847,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -889,7 +889,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -916,7 +916,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -934,7 +934,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -954,7 +954,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -977,7 +977,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1005,7 +1005,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1030,7 +1030,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1051,7 +1051,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1077,7 +1077,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1108,7 +1108,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1134,7 +1134,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1166,7 +1166,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1205,7 +1205,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1253,7 +1253,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1294,7 +1294,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1327,7 +1327,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1369,7 +1369,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1396,7 +1396,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1415,7 +1415,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1436,7 +1436,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1460,7 +1460,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1489,7 +1489,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1515,7 +1515,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1537,7 +1537,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1564,7 +1564,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1596,7 +1596,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1623,7 +1623,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1656,7 +1656,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1696,7 +1696,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1745,7 +1745,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1787,7 +1787,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1821,7 +1821,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1864,7 +1864,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1892,7 +1892,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1911,7 +1911,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1932,7 +1932,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1956,7 +1956,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1985,7 +1985,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2011,7 +2011,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2033,7 +2033,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2060,7 +2060,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2092,7 +2092,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2119,7 +2119,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2152,7 +2152,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2192,7 +2192,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2241,7 +2241,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2283,7 +2283,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2317,7 +2317,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2360,7 +2360,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) diff --git a/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.intertwined.expect index 42800a0d7f5..2947b7e105d 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -32,13 +32,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -61,13 +61,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -93,13 +93,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -131,13 +131,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -166,13 +166,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(implements) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -195,13 +195,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(with) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -230,13 +230,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(with) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -262,8 +262,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -276,7 +276,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -296,8 +296,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -310,7 +310,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -337,8 +337,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -351,7 +351,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -385,8 +385,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -399,7 +399,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -443,8 +443,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -457,7 +457,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -494,8 +494,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -508,7 +508,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -535,8 +535,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -549,7 +549,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -586,8 +586,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -600,7 +600,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -630,13 +630,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -661,13 +661,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -695,13 +695,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -732,13 +732,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -775,13 +775,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -815,13 +815,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -849,13 +849,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -889,13 +889,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -926,8 +926,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -940,7 +940,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -965,8 +965,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -979,7 +979,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1011,8 +1011,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1025,7 +1025,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1064,8 +1064,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1078,7 +1078,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1127,8 +1127,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1141,7 +1141,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1183,8 +1183,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1197,7 +1197,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1229,8 +1229,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1243,7 +1243,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1285,8 +1285,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1299,7 +1299,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1334,13 +1334,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1365,13 +1365,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1399,13 +1399,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1436,13 +1436,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1479,13 +1479,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1519,13 +1519,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1553,13 +1553,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1593,13 +1593,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1630,8 +1630,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1644,7 +1644,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1669,8 +1669,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1683,7 +1683,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1715,8 +1715,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1729,7 +1729,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1768,8 +1768,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1782,7 +1782,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1831,8 +1831,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1845,7 +1845,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1887,8 +1887,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1901,7 +1901,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1933,8 +1933,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1947,7 +1947,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1989,8 +1989,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2003,7 +2003,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -2038,13 +2038,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2071,13 +2071,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2107,13 +2107,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2146,13 +2146,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2191,13 +2191,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2233,13 +2233,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2269,13 +2269,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2311,13 +2311,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2350,8 +2350,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2364,7 +2364,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2391,8 +2391,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2405,7 +2405,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2439,8 +2439,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2453,7 +2453,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2494,8 +2494,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2508,7 +2508,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2559,8 +2559,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2573,7 +2573,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2617,8 +2617,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2631,7 +2631,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2665,8 +2665,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2679,7 +2679,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2723,8 +2723,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2737,7 +2737,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2774,13 +2774,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -2807,13 +2807,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -2843,13 +2843,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -2882,13 +2882,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -2927,13 +2927,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -2969,13 +2969,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -3005,13 +3005,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -3047,13 +3047,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -3086,8 +3086,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3100,7 +3100,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3127,8 +3127,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3141,7 +3141,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3175,8 +3175,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3189,7 +3189,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3230,8 +3230,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3244,7 +3244,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3295,8 +3295,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3309,7 +3309,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3353,8 +3353,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3367,7 +3367,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3401,8 +3401,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3415,7 +3415,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3459,8 +3459,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3473,7 +3473,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) diff --git a/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.expect index 00e7b234568..1ec11f66f17 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.expect @@ -390,7 +390,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(;) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -406,7 +406,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(O, typeReference) handleNoTypeArguments(;) @@ -424,7 +424,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(O, typeReference) handleNoTypeArguments(implements) @@ -445,7 +445,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(O, typeReference) handleNoTypeArguments(with) @@ -471,7 +471,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleIdentifier(O, typeReference) handleNoTypeArguments(with) @@ -494,7 +494,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(implements) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -513,7 +513,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(with) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -537,7 +537,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(with) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) @@ -566,7 +566,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -590,7 +590,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleIdentifier(O, typeReference) beginTypeArguments(<) @@ -620,7 +620,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleIdentifier(O, typeReference) beginTypeArguments(<) @@ -657,7 +657,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleIdentifier(O, typeReference) beginTypeArguments(<) @@ -703,7 +703,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleIdentifier(O, typeReference) beginTypeArguments(<) @@ -742,7 +742,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -773,7 +773,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -813,7 +813,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, >, null) handleNoType(>) handleClassExtends(null, 1) @@ -838,7 +838,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -857,7 +857,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -878,7 +878,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -902,7 +902,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -931,7 +931,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -957,7 +957,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -979,7 +979,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1006,7 +1006,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1038,7 +1038,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1065,7 +1065,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1098,7 +1098,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1138,7 +1138,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1187,7 +1187,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1229,7 +1229,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1263,7 +1263,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1306,7 +1306,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1334,7 +1334,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1353,7 +1353,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1374,7 +1374,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1398,7 +1398,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1427,7 +1427,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1453,7 +1453,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1475,7 +1475,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1502,7 +1502,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(() - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1534,7 +1534,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1561,7 +1561,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1594,7 +1594,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1634,7 +1634,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1683,7 +1683,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1725,7 +1725,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1759,7 +1759,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1802,7 +1802,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(() beginFormalParameters((, MemberKind.PrimaryConstructor) endFormalParameters(0, (, ), MemberKind.PrimaryConstructor) @@ -1830,7 +1830,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1850,7 +1850,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1872,7 +1872,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1897,7 +1897,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1927,7 +1927,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1954,7 +1954,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -1977,7 +1977,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2005,7 +2005,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2038,7 +2038,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2066,7 +2066,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2100,7 +2100,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2141,7 +2141,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2191,7 +2191,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2234,7 +2234,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2269,7 +2269,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2313,7 +2313,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2342,7 +2342,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2362,7 +2362,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2384,7 +2384,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2409,7 +2409,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2439,7 +2439,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2466,7 +2466,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2489,7 +2489,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2517,7 +2517,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(.) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2550,7 +2550,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2578,7 +2578,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2612,7 +2612,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2653,7 +2653,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2703,7 +2703,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2746,7 +2746,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2781,7 +2781,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) @@ -2825,7 +2825,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) beginPrimaryConstructor(.) handleIdentifier(named, primaryConstructorDeclaration) beginFormalParameters((, MemberKind.PrimaryConstructor) diff --git a/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect index ff599979f75..8d68d3e5555 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -34,13 +34,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -65,13 +65,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -99,13 +99,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -139,13 +139,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -176,13 +176,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(implements) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -207,13 +207,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(with) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -244,13 +244,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(with) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) @@ -278,8 +278,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -292,7 +292,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -314,8 +314,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -328,7 +328,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -357,8 +357,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -371,7 +371,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -407,8 +407,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -421,7 +421,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -467,8 +467,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -481,7 +481,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -520,8 +520,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -534,7 +534,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -563,8 +563,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -577,7 +577,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -616,8 +616,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -630,7 +630,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, >, null) @@ -662,13 +662,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -695,13 +695,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -731,13 +731,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -770,13 +770,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -815,13 +815,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -857,13 +857,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -893,13 +893,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -935,13 +935,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(() @@ -974,8 +974,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -988,7 +988,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1015,8 +1015,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1029,7 +1029,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1063,8 +1063,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1077,7 +1077,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1118,8 +1118,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1132,7 +1132,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1183,8 +1183,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1197,7 +1197,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1241,8 +1241,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1255,7 +1255,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1289,8 +1289,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1303,7 +1303,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1347,8 +1347,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1361,7 +1361,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(() @@ -1398,13 +1398,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1431,13 +1431,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1467,13 +1467,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1506,13 +1506,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1551,13 +1551,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1593,13 +1593,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1629,13 +1629,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1671,13 +1671,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(() - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(() @@ -1710,8 +1710,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1724,7 +1724,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1751,8 +1751,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1765,7 +1765,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1799,8 +1799,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1813,7 +1813,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1854,8 +1854,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1868,7 +1868,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1919,8 +1919,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1933,7 +1933,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -1977,8 +1977,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -1991,7 +1991,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -2025,8 +2025,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2039,7 +2039,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -2083,8 +2083,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2097,7 +2097,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(() @@ -2134,13 +2134,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2169,13 +2169,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2207,13 +2207,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2248,13 +2248,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2295,13 +2295,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2339,13 +2339,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2377,13 +2377,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2421,13 +2421,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: beginPrimaryConstructor(.) @@ -2462,8 +2462,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2476,7 +2476,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2505,8 +2505,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2519,7 +2519,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2555,8 +2555,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2569,7 +2569,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2612,8 +2612,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2626,7 +2626,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2679,8 +2679,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2693,7 +2693,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2739,8 +2739,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2753,7 +2753,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2789,8 +2789,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2803,7 +2803,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2849,8 +2849,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -2863,7 +2863,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, null) listener: beginPrimaryConstructor(.) @@ -2902,13 +2902,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -2937,13 +2937,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -2975,13 +2975,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -3016,13 +3016,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -3063,13 +3063,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -3107,13 +3107,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -3145,13 +3145,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -3189,13 +3189,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(.) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, const) listener: beginPrimaryConstructor(.) @@ -3230,8 +3230,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3244,7 +3244,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3273,8 +3273,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3287,7 +3287,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3323,8 +3323,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3337,7 +3337,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3380,8 +3380,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3394,7 +3394,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3447,8 +3447,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3461,7 +3461,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3507,8 +3507,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3521,7 +3521,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3557,8 +3557,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3571,7 +3571,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3617,8 +3617,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(const, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -3631,7 +3631,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(>, class, class, const, C) parsePrimaryConstructorOpt(DeclarationKind.Class, >, const) listener: beginPrimaryConstructor(.) @@ -3670,7 +3670,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -3706,7 +3706,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -3745,7 +3745,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -3789,7 +3789,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -3840,7 +3840,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -3876,7 +3876,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -3915,7 +3915,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -3959,7 +3959,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -4010,7 +4010,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -4048,7 +4048,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -4089,7 +4089,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -4135,7 +4135,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -4188,7 +4188,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -4226,7 +4226,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -4267,7 +4267,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -4313,7 +4313,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) diff --git a/pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.intertwined.expect index 0e585ddff99..f04a913fd43 100644 --- a/pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(extension, , extension, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -40,7 +40,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -77,7 +77,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -119,7 +119,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -168,7 +168,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -202,7 +202,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -239,7 +239,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -281,7 +281,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -330,7 +330,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -366,7 +366,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -405,7 +405,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -449,7 +449,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -500,7 +500,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -536,7 +536,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -575,7 +575,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) @@ -619,7 +619,7 @@ parseUnit(extension) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, ;, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionTypeDeclaration(extension, type, null, extension, type) 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 00df66d8d4e..f89cca29a05 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, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) 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 5a2cc0d5be5..8f9fd29a6ec 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) diff --git a/pkg/front_end/parser_testcases/record/issue_52365.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/issue_52365.dart.intertwined.expect index 395995a9fee..c0b161d8f55 100644 --- a/pkg/front_end/parser_testcases/record/issue_52365.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/issue_52365.dart.intertwined.expect @@ -2074,7 +2074,7 @@ parseUnit(void) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) @@ -2384,7 +2384,7 @@ parseUnit(void) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(extension, }, extension, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseExtension(extension, null, extension) listener: beginExtensionDeclarationPrelude(extension) parseExtensionDeclaration(extension, extension, null, extension) diff --git a/pkg/front_end/parser_testcases/record/metadata.dart.expect b/pkg/front_end/parser_testcases/record/metadata.dart.expect index 504753395de..564f0b6477e 100644 --- a/pkg/front_end/parser_testcases/record/metadata.dart.expect +++ b/pkg/front_end/parser_testcases/record/metadata.dart.expect @@ -249,7 +249,7 @@ beginCompilationUnit(@) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, null, C) handleNoPrimaryConstructor(DeclarationKind.Class, C, null) handleNoType(C) handleClassExtends(null, 1) diff --git a/pkg/front_end/parser_testcases/record/metadata.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/metadata.dart.intertwined.expect index 77432515954..99ae8f8632e 100644 --- a/pkg/front_end/parser_testcases/record/metadata.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/metadata.dart.intertwined.expect @@ -340,13 +340,13 @@ parseUnit(@) listener: endArguments(2, (, )) listener: endMetadata(@, null, )) listener: endMetadataStar(1) - parseTopLevelKeywordDeclaration(class, ), class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ), class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, C) parseClass(C, class, class, null, C) parsePrimaryConstructorOpt(DeclarationKind.Class, C, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, C, null) 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 84e85865d10..9b1c918d4d8 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, null, null, null, null, Foo) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 a4b5eedbd80..5ec8d950206 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(abstract, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(abstract, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(abstract, abstract, null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, null, Foo) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, null, Foo) parseClass(Foo, abstract, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 49b97a4ace4..1341894ae79 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) @@ -69,7 +69,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) handleNoType(Bar) handleClassExtends(null, 1) 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 cde1c8fb506..729e60cfad2 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) @@ -136,13 +136,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, null, Bar) parsePrimaryConstructorOpt(DeclarationKind.Class, Bar, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) 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 d5c97e09c74..9670acc5a62 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 @@ -187,7 +187,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Baz, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Baz) + beginClassDeclaration(class, null, null, null, null, null, null, null, Baz) handleNoPrimaryConstructor(DeclarationKind.Class, Baz, null) handleNoType(Baz) handleClassExtends(null, 1) 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 30da352f522..3b3724683bd 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 @@ -410,13 +410,13 @@ parseUnit(() parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Baz) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Baz) parseClass(Baz, class, class, null, Baz) parsePrimaryConstructorOpt(DeclarationKind.Class, Baz, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Baz, null) 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 8aa73ef4e7c..6c18e00cb66 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 @@ -909,7 +909,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) @@ -1859,7 +1859,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) handleNoType(Bar) handleClassExtends(null, 1) 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 71893acf2bb..72e769d80f8 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 @@ -1857,13 +1857,13 @@ parseUnit(() parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) @@ -3840,13 +3840,13 @@ parseUnit(() parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, null, Bar) parsePrimaryConstructorOpt(DeclarationKind.Class, Bar, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) 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 673fd55192b..51891d58f08 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 @@ -174,7 +174,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) @@ -364,7 +364,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) handleNoType(Bar) handleClassExtends(null, 1) 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 e9b2bafff4b..55aeec54d12 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 @@ -367,13 +367,13 @@ parseUnit(() parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, ;, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) @@ -774,13 +774,13 @@ parseUnit(() parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(class, }, class, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, }, class, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, null, Bar) parsePrimaryConstructorOpt(DeclarationKind.Class, Bar, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Bar, null) 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 63fc0651cb9..92f75bfe9bb 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleNoType(Foo) handleClassExtends(null, 1) 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 8ccf55d1499..73eafc25b1b 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 0e83d541fa4..43871999e42 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, , typedef, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseTopLevelKeywordDeclaration(typedef, , typedef, null, null, null, DirectiveContext(DirectiveState.Unknown)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -47,7 +47,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -83,7 +83,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -124,7 +124,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -160,7 +160,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -217,7 +217,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -279,7 +279,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -346,7 +346,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -418,7 +418,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -495,7 +495,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(typedef, ;, typedef, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseTypedef(null, 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 3c693d3b1de..807cff7d745 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, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) handleIdentifier(Bar, typeReference) handleNoTypeArguments({) 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 f5309a360bf..b9c6f5091a1 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, , class, null, null, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(class, null, null, null, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(class, , class, null, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(class, null, null, 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, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, null, Foo) parsePrimaryConstructorOpt(DeclarationKind.Class, Foo, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Foo, null) 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 index 14e025ea770..f044a0e1cd2 100644 --- a/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.expect +++ b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(sealed) beginClassOrMixinOrNamedMixinApplicationPrelude(sealed) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(sealed, null, null, sealed, null, null, null, null, null, Class) + beginClassDeclaration(sealed, null, sealed, null, null, null, null, null, Class) handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) handleNoType(Class) handleClassExtends(null, 1) @@ -33,7 +33,7 @@ beginCompilationUnit(sealed) beginClassOrMixinOrNamedMixinApplicationPrelude(sealed) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(sealed, null, null, sealed, null, null, null, null, null, A) + beginNamedMixinApplication(sealed, null, sealed, null, null, null, null, null, A) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) 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 index e1f776a4437..524b168c9df 100644 --- 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 @@ -6,13 +6,13 @@ parseUnit(sealed) parseMetadataStar() listener: beginMetadataStar(sealed) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(sealed, , class, null, sealed, null, null, DirectiveContext(DirectiveState.Unknown)) - parseClassOrNamedMixinApplication(sealed, null, null, sealed, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(sealed, , class, sealed, null, null, DirectiveContext(DirectiveState.Unknown)) + parseClassOrNamedMixinApplication(sealed, null, sealed, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(sealed) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(sealed, null, null, sealed, null, null, null, null, null, Class) + listener: beginClassDeclaration(sealed, null, sealed, null, null, null, null, null, Class) parseClass(Class, sealed, class, null, Class) parsePrimaryConstructorOpt(DeclarationKind.Class, Class, null) listener: handleNoPrimaryConstructor(DeclarationKind.Class, Class, null) @@ -35,7 +35,7 @@ parseUnit(sealed) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, null, DirectiveContext(DirectiveState.Declarations)) + parseTopLevelKeywordDeclaration(mixin, }, mixin, null, null, null, DirectiveContext(DirectiveState.Declarations)) parseMixin(mixin, null, null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -58,13 +58,13 @@ parseUnit(sealed) parseMetadataStar(}) listener: beginMetadataStar(sealed) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(sealed, }, class, null, sealed, null, null, DirectiveContext(DirectiveState.Declarations)) - parseClassOrNamedMixinApplication(sealed, null, null, sealed, null, null, null, null, null, class) + parseTopLevelKeywordDeclaration(sealed, }, class, sealed, null, null, DirectiveContext(DirectiveState.Declarations)) + parseClassOrNamedMixinApplication(sealed, null, sealed, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(sealed) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(sealed, null, null, sealed, null, null, null, null, null, A) + listener: beginNamedMixinApplication(sealed, null, sealed, null, null, null, null, null, A) parseNamedMixinApplication(A, sealed, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/test/lint_suite.dart b/pkg/front_end/test/lint_suite.dart index f949bb1a731..3523428d239 100644 --- a/pkg/front_end/test/lint_suite.dart +++ b/pkg/front_end/test/lint_suite.dart @@ -318,7 +318,7 @@ class ImportsTwiceLintListener extends LintListener { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { Token importUriToken = importKeyword.next!; String importUri = importUriToken.lexeme; if (importUri.startsWith("r")) { diff --git a/pkg/front_end/test/parser_test_listener.dart b/pkg/front_end/test/parser_test_listener.dart index dfae3f0287f..d5949d3ced6 100644 --- a/pkg/front_end/test/parser_test_listener.dart +++ b/pkg/front_end/test/parser_test_listener.dart @@ -284,7 +284,6 @@ class ParserTestListener implements Listener { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -295,7 +294,6 @@ class ParserTestListener implements Listener { ) { seen(begin); seen(abstractToken); - seen(macroToken); seen(sealedToken); seen(baseToken); seen(interfaceToken); @@ -307,7 +305,6 @@ class ParserTestListener implements Listener { 'beginClassDeclaration(' '$begin, ' '$abstractToken, ' - '$macroToken, ' '$sealedToken, ' '$baseToken, ' '$interfaceToken, ' @@ -1513,7 +1510,6 @@ class ParserTestListener implements Listener { void beginNamedMixinApplication( Token beginToken, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -1524,7 +1520,6 @@ class ParserTestListener implements Listener { ) { seen(beginToken); seen(abstractToken); - seen(macroToken); seen(sealedToken); seen(baseToken); seen(interfaceToken); @@ -1536,7 +1531,6 @@ class ParserTestListener implements Listener { 'beginNamedMixinApplication(' '$beginToken, ' '$abstractToken, ' - '$macroToken, ' '$sealedToken, ' '$baseToken, ' '$interfaceToken, ' @@ -1718,15 +1712,13 @@ class ParserTestListener implements Listener { } @override - void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) { + void endImport(Token importKeyword, Token? semicolon) { indent--; seen(importKeyword); - seen(augmentToken); seen(semicolon); doPrint( 'endImport(' '$importKeyword, ' - '$augmentToken, ' '$semicolon)', ); } diff --git a/pkg/front_end/test/parser_test_listener_creator.dart b/pkg/front_end/test/parser_test_listener_creator.dart index 0c6ad493478..016d591b14e 100644 --- a/pkg/front_end/test/parser_test_listener_creator.dart +++ b/pkg/front_end/test/parser_test_listener_creator.dart @@ -139,7 +139,6 @@ class ParserCreatorListener extends Listener { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, diff --git a/pkg/front_end/test/parser_test_parser.dart b/pkg/front_end/test/parser_test_parser.dart index 85d6525c2ce..8a45b6200d3 100644 --- a/pkg/front_end/test/parser_test_parser.dart +++ b/pkg/front_end/test/parser_test_parser.dart @@ -206,7 +206,6 @@ class TestParser extends Parser { Token beginToken, Token modifierStart, Token keyword, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -217,7 +216,6 @@ class TestParser extends Parser { '$beginToken, ' '$modifierStart, ' '$keyword, ' - '$macroToken, ' '$sealedToken, ' '$baseToken, ' '$interfaceToken, ' @@ -228,7 +226,6 @@ class TestParser extends Parser { beginToken, modifierStart, keyword, - macroToken, sealedToken, baseToken, interfaceToken, @@ -881,7 +878,6 @@ class TestParser extends Parser { Token parseClassOrNamedMixinApplication( Token beginToken, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, @@ -894,7 +890,6 @@ class TestParser extends Parser { 'parseClassOrNamedMixinApplication(' '$beginToken, ' '$abstractToken, ' - '$macroToken, ' '$sealedToken, ' '$baseToken, ' '$interfaceToken, ' @@ -907,7 +902,6 @@ class TestParser extends Parser { var result = super.parseClassOrNamedMixinApplication( beginToken, abstractToken, - macroToken, sealedToken, baseToken, interfaceToken, diff --git a/pkg/front_end/test/parser_test_parser_creator.dart b/pkg/front_end/test/parser_test_parser_creator.dart index 710b1dc1415..3d54096cc86 100644 --- a/pkg/front_end/test/parser_test_parser_creator.dart +++ b/pkg/front_end/test/parser_test_parser_creator.dart @@ -141,7 +141,6 @@ class ParserCreatorListener extends Listener { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken, diff --git a/pkg/front_end/testcases/general/macro_class.dart.strong.expect b/pkg/front_end/testcases/general/macro_class.dart.strong.expect index 86e7b8e56d4..dca0d1d9c89 100644 --- a/pkg/front_end/testcases/general/macro_class.dart.strong.expect +++ b/pkg/front_end/testcases/general/macro_class.dart.strong.expect @@ -2,26 +2,73 @@ library; // // Problems in library: // -// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // macro class Class1 {} // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: Expected ';' after this. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:1: Error: Can't have modifier 'abstract' here. +// Try removing 'abstract'. +// abstract macro class Class2 {} +// ^^^^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // abstract macro class Class2 {} // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: Expected ';' after this. +// abstract macro class Class2 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // macro class Class3 = Super with Mixin; // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: Expected ';' after this. +// macro class Class3 = Super with Mixin; +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:1: Error: Can't have modifier 'abstract' here. +// Try removing 'abstract'. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // abstract macro class Class4 = Super with Mixin; // ^^^^^ // +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: Expected ';' after this. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: 'macro' is already declared in this scope. +// abstract macro class Class2 {} +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: 'macro' is already declared in this scope. +// macro class Class3 = Super with Mixin; +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: 'macro' is already declared in this scope. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// import self as self; import "dart:core" as core; @@ -37,7 +84,7 @@ class Class1 extends core::Object { : super core::Object::•() ; } -abstract class Class2 extends core::Object { +class Class2 extends core::Object { synthetic constructor •() → self::Class2 : super core::Object::•() ; @@ -47,9 +94,10 @@ class Class3 = self::Super with self::Mixin { : super self::Super::•() ; } -abstract class Class4 = self::Super with self::Mixin { +class Class4 = self::Super with self::Mixin { synthetic constructor •() → self::Class4 : super self::Super::•() ; } +static field dynamic macro; static method main() → dynamic {} diff --git a/pkg/front_end/testcases/general/macro_class.dart.strong.modular.expect b/pkg/front_end/testcases/general/macro_class.dart.strong.modular.expect index 86e7b8e56d4..dca0d1d9c89 100644 --- a/pkg/front_end/testcases/general/macro_class.dart.strong.modular.expect +++ b/pkg/front_end/testcases/general/macro_class.dart.strong.modular.expect @@ -2,26 +2,73 @@ library; // // Problems in library: // -// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // macro class Class1 {} // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: Expected ';' after this. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:1: Error: Can't have modifier 'abstract' here. +// Try removing 'abstract'. +// abstract macro class Class2 {} +// ^^^^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // abstract macro class Class2 {} // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: Expected ';' after this. +// abstract macro class Class2 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // macro class Class3 = Super with Mixin; // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: Expected ';' after this. +// macro class Class3 = Super with Mixin; +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:1: Error: Can't have modifier 'abstract' here. +// Try removing 'abstract'. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // abstract macro class Class4 = Super with Mixin; // ^^^^^ // +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: Expected ';' after this. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: 'macro' is already declared in this scope. +// abstract macro class Class2 {} +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: 'macro' is already declared in this scope. +// macro class Class3 = Super with Mixin; +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: 'macro' is already declared in this scope. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// import self as self; import "dart:core" as core; @@ -37,7 +84,7 @@ class Class1 extends core::Object { : super core::Object::•() ; } -abstract class Class2 extends core::Object { +class Class2 extends core::Object { synthetic constructor •() → self::Class2 : super core::Object::•() ; @@ -47,9 +94,10 @@ class Class3 = self::Super with self::Mixin { : super self::Super::•() ; } -abstract class Class4 = self::Super with self::Mixin { +class Class4 = self::Super with self::Mixin { synthetic constructor •() → self::Class4 : super self::Super::•() ; } +static field dynamic macro; static method main() → dynamic {} diff --git a/pkg/front_end/testcases/general/macro_class.dart.strong.outline.expect b/pkg/front_end/testcases/general/macro_class.dart.strong.outline.expect index e0159440e47..1960a66ee62 100644 --- a/pkg/front_end/testcases/general/macro_class.dart.strong.outline.expect +++ b/pkg/front_end/testcases/general/macro_class.dart.strong.outline.expect @@ -2,26 +2,73 @@ library; // // Problems in library: // -// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // macro class Class1 {} // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: Expected ';' after this. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:1: Error: Can't have modifier 'abstract' here. +// Try removing 'abstract'. +// abstract macro class Class2 {} +// ^^^^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // abstract macro class Class2 {} // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: Expected ';' after this. +// abstract macro class Class2 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // macro class Class3 = Super with Mixin; // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: Expected ';' after this. +// macro class Class3 = Super with Mixin; +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:1: Error: Can't have modifier 'abstract' here. +// Try removing 'abstract'. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // abstract macro class Class4 = Super with Mixin; // ^^^^^ // +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: Expected ';' after this. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: 'macro' is already declared in this scope. +// abstract macro class Class2 {} +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: 'macro' is already declared in this scope. +// macro class Class3 = Super with Mixin; +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: 'macro' is already declared in this scope. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// import self as self; import "dart:core" as core; @@ -35,7 +82,7 @@ class Class1 extends core::Object { synthetic constructor •() → self::Class1 ; } -abstract class Class2 extends core::Object { +class Class2 extends core::Object { synthetic constructor •() → self::Class2 ; } @@ -44,10 +91,11 @@ class Class3 = self::Super with self::Mixin { : super self::Super::•() ; } -abstract class Class4 = self::Super with self::Mixin { +class Class4 = self::Super with self::Mixin { synthetic constructor •() → self::Class4 : super self::Super::•() ; } +static field dynamic macro; static method main() → dynamic ; diff --git a/pkg/front_end/testcases/general/macro_class.dart.strong.transformed.expect b/pkg/front_end/testcases/general/macro_class.dart.strong.transformed.expect index 56bc5c7bfac..25e90270cce 100644 --- a/pkg/front_end/testcases/general/macro_class.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/macro_class.dart.strong.transformed.expect @@ -2,26 +2,73 @@ library; // // Problems in library: // -// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // macro class Class1 {} // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:8:1: Error: Expected ';' after this. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:1: Error: Can't have modifier 'abstract' here. +// Try removing 'abstract'. +// abstract macro class Class2 {} +// ^^^^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // abstract macro class Class2 {} // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: Expected ';' after this. +// abstract macro class Class2 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // macro class Class3 = Super with Mixin; // ^^^^^ // -// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: This requires the experimental 'macros' language feature to be enabled. -// Try passing the '--enable-experiment=macros' command line option. +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: Expected ';' after this. +// macro class Class3 = Super with Mixin; +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:1: Error: Can't have modifier 'abstract' here. +// Try removing 'abstract'. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: Variables must be declared using the keywords 'const', 'final', 'var' or a type name. +// Try adding the name of the type of the variable or the keyword 'var'. // abstract macro class Class4 = Super with Mixin; // ^^^^^ // +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: Expected ';' after this. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:9:10: Error: 'macro' is already declared in this scope. +// abstract macro class Class2 {} +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:10:1: Error: 'macro' is already declared in this scope. +// macro class Class3 = Super with Mixin; +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// +// pkg/front_end/testcases/general/macro_class.dart:11:10: Error: 'macro' is already declared in this scope. +// abstract macro class Class4 = Super with Mixin; +// ^^^^^ +// pkg/front_end/testcases/general/macro_class.dart:8:1: Context: Previous declaration of 'macro'. +// macro class Class1 {} +// ^^^^^ +// import self as self; import "dart:core" as core; @@ -37,7 +84,7 @@ class Class1 extends core::Object { : super core::Object::•() ; } -abstract class Class2 extends core::Object { +class Class2 extends core::Object { synthetic constructor •() → self::Class2 : super core::Object::•() ; @@ -47,9 +94,10 @@ class Class3 extends self::Super implements self::Mixin /*isEliminatedMixin*/ { : super self::Super::•() ; } -abstract class Class4 extends self::Super implements self::Mixin /*isEliminatedMixin*/ { +class Class4 extends self::Super implements self::Mixin /*isEliminatedMixin*/ { synthetic constructor •() → self::Class4 : super self::Super::•() ; } +static field dynamic macro; static method main() → dynamic {} diff --git a/pkg/front_end/testcases/general/macro_class.dart.textual_outline.expect b/pkg/front_end/testcases/general/macro_class.dart.textual_outline.expect index a12497d58de..71acd938a1b 100644 --- a/pkg/front_end/testcases/general/macro_class.dart.textual_outline.expect +++ b/pkg/front_end/testcases/general/macro_class.dart.textual_outline.expect @@ -2,12 +2,20 @@ class Super {} mixin Mixin {} -macro class Class1 {} +macro ; -abstract macro class Class2 {} +class Class1 {} -macro class Class3 = Super with Mixin; +abstract macro ; -abstract macro class Class4 = Super with Mixin; +class Class2 {} + +macro ; + +class Class3 = Super with Mixin; + +abstract macro ; + +class Class4 = Super with Mixin; main() {} diff --git a/pkg/front_end/testcases/general/macro_class.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general/macro_class.dart.textual_outline_modelled.expect index 1353def3421..584b532f70b 100644 --- a/pkg/front_end/testcases/general/macro_class.dart.textual_outline_modelled.expect +++ b/pkg/front_end/testcases/general/macro_class.dart.textual_outline_modelled.expect @@ -1,12 +1,20 @@ -abstract macro class Class2 {} +abstract macro ; -abstract macro class Class4 = Super with Mixin; +abstract macro ; + +class Class1 {} + +class Class2 {} + +class Class3 = Super with Mixin; + +class Class4 = Super with Mixin; class Super {} -macro class Class1 {} +macro ; -macro class Class3 = Super with Mixin; +macro ; main() {} diff --git a/pkg/front_end/tool/parser_ast_helper_creator.dart b/pkg/front_end/tool/parser_ast_helper_creator.dart index 5c728eeca90..8da4ced6058 100644 --- a/pkg/front_end/tool/parser_ast_helper_creator.dart +++ b/pkg/front_end/tool/parser_ast_helper_creator.dart @@ -201,7 +201,6 @@ class ParserCreatorListener extends Listener { void beginClassDeclaration( Token begin, Token? abstractToken, - Token? macroToken, Token? sealedToken, Token? baseToken, Token? interfaceToken,