From 120bfdc076960e5162ad6eaf496ec88d9b0f14f0 Mon Sep 17 00:00:00 2001 From: Kallen Tu Date: Wed, 14 Dec 2022 15:41:58 +0000 Subject: [PATCH] [analyzer/cfe] Parse 'mixin class' behind sealed flag. Allow 'mixin class' modifier which allows a class to be used as a mixin. https://github.com/dart-lang/language/blob/master/working/base-interface-final/feature-specification.md Change-Id: I6b4dac75f2ff09b7ef833c5e015b1baf7fa3883b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/275144 Reviewed-by: Johnni Winther Commit-Queue: Kallen Tu Reviewed-by: Konstantin Shcheglov --- .../lib/src/parser/forwarding_listener.dart | 6 +- .../lib/src/parser/listener.dart | 2 + .../lib/src/parser/parser_impl.dart | 39 ++- pkg/analyzer/lib/src/dart/ast/ast.dart | 13 + pkg/analyzer/lib/src/fasta/ast_builder.dart | 28 ++ .../test/generated/parser_fasta_listener.dart | 6 +- .../test/src/fasta/ast_builder_test.dart | 44 +++ .../partial_code/mixin_declaration_test.dart | 2 +- .../fasta/kernel/macro/annotation_parser.dart | 2 + .../lib/src/fasta/source/diet_listener.dart | 1 + .../lib/src/fasta/source/outline_builder.dart | 26 +- .../fasta/source/source_class_builder.dart | 6 +- .../fasta/source/source_library_builder.dart | 33 ++- .../lib/src/fasta/util/parser_ast_helper.dart | 10 + .../augmentation/augment_super.dart.expect | 2 +- .../augment_super.dart.intertwined.expect | 4 +- .../member_declarations.dart.expect | 2 +- ...ember_declarations.dart.intertwined.expect | 4 +- .../augmentation/member_errors.dart.expect | 2 +- .../member_errors.dart.intertwined.expect | 4 +- .../top_level_declarations.dart.expect | 8 +- ...level_declarations.dart.intertwined.expect | 16 +- .../augmentation/top_level_errors.dart.expect | 8 +- .../top_level_errors.dart.intertwined.expect | 16 +- .../bracket_mismatch_01.dart.expect | 4 +- ...racket_mismatch_01.dart.intertwined.expect | 8 +- ...ecovery_bad_name_general.crash_dart.expect | 2 +- ...name_general.crash_dart.intertwined.expect | 4 +- ...or_recovery_bad_name_get.crash_dart.expect | 2 +- ...bad_name_get.crash_dart.intertwined.expect | 4 +- ...ery_bad_name_return_type.crash_dart.expect | 2 +- ..._return_type.crash_dart.intertwined.expect | 4 +- ...or_recovery_bad_name_set.crash_dart.expect | 2 +- ...bad_name_set.crash_dart.intertwined.expect | 4 +- .../constructor_recovery_get.dart.expect | 2 +- ...uctor_recovery_get.dart.intertwined.expect | 4 +- .../constructor_recovery_ok.dart.expect | 2 +- ...ructor_recovery_ok.dart.intertwined.expect | 4 +- ...ructor_recovery_operator.crash_dart.expect | 2 +- ...ery_operator.crash_dart.intertwined.expect | 4 +- ...nstructor_recovery_return_type.dart.expect | 2 +- ...covery_return_type.dart.intertwined.expect | 4 +- .../constructor_recovery_set.dart.expect | 2 +- ...uctor_recovery_set.dart.intertwined.expect | 4 +- .../error_recovery/issue_000032.dart.expect | 2 +- .../issue_000032.dart.intertwined.expect | 4 +- .../error_recovery/issue_22313.dart.expect | 10 +- .../issue_22313.dart.intertwined.expect | 20 +- .../error_recovery/issue_22314.dart.expect | 6 +- .../issue_22314.dart.intertwined.expect | 12 +- .../error_recovery/issue_26810.dart.expect | 2 +- .../issue_26810.dart.intertwined.expect | 4 +- .../issue_26810_and.dart.expect | 2 +- .../issue_26810_and.dart.intertwined.expect | 4 +- .../error_recovery/issue_26810_or.dart.expect | 2 +- .../issue_26810_or.dart.intertwined.expect | 4 +- .../issue_39026.crash_dart.expect | 2 +- .../issue_39026.crash_dart.intertwined.expect | 4 +- .../issue_39026_prime.crash_dart.expect | 2 +- ..._39026_prime.crash_dart.intertwined.expect | 4 +- .../issue_39230.crash_dart.expect | 2 +- .../issue_39230.crash_dart.intertwined.expect | 4 +- .../issue_41265.crash_dart.expect | 4 +- .../issue_41265.crash_dart.intertwined.expect | 8 +- .../error_recovery/issue_45251.dart.expect | 2 +- .../issue_45251.dart.intertwined.expect | 4 +- .../issue_45251_const.dart.expect | 2 +- .../issue_45251_const.dart.intertwined.expect | 4 +- .../issue_45251_list.dart.expect | 2 +- .../issue_45251_list.dart.intertwined.expect | 4 +- .../issue_45251_list_const.dart.expect | 2 +- ...e_45251_list_const.dart.intertwined.expect | 4 +- .../issue_45251_list_new.dart.expect | 2 +- ...sue_45251_list_new.dart.intertwined.expect | 4 +- .../issue_45251_new.dart.expect | 2 +- .../issue_45251_new.dart.intertwined.expect | 4 +- .../issue_45251_set.dart.expect | 2 +- .../issue_45251_set.dart.intertwined.expect | 4 +- .../issue_45251_set_const.dart.expect | 2 +- ...ue_45251_set_const.dart.intertwined.expect | 4 +- .../issue_45251_set_new.dart.expect | 2 +- ...ssue_45251_set_new.dart.intertwined.expect | 4 +- .../issue_45327_prime_1.crash_dart.expect | 2 +- ...5327_prime_1.crash_dart.intertwined.expect | 4 +- .../error_recovery/issue_46346.dart.expect | 138 ++++----- .../issue_46346.dart.intertwined.expect | 276 +++++++++--------- .../issue_46346_prime_1.dart.expect | 138 ++++----- ...ssue_46346_prime_1.dart.intertwined.expect | 276 +++++++++--------- .../issue_46346_prime_2.dart.expect | 2 +- ...ssue_46346_prime_2.dart.intertwined.expect | 4 +- .../issue_46505.crash_dart.expect | 4 +- .../issue_46505.crash_dart.intertwined.expect | 8 +- .../issue_46505_prime_1.crash_dart.expect | 2 +- ...6505_prime_1.crash_dart.intertwined.expect | 4 +- .../issue_46505_prime_2.crash_dart.expect | 2 +- ...6505_prime_2.crash_dart.intertwined.expect | 4 +- .../issue_46505_prime_3.crash_dart.expect | 2 +- ...6505_prime_3.crash_dart.intertwined.expect | 4 +- .../issue_46505_prime_4.crash_dart.expect | 2 +- ...6505_prime_4.crash_dart.intertwined.expect | 4 +- .../issue_46505_prime_5.crash_dart.expect | 6 +- ...6505_prime_5.crash_dart.intertwined.expect | 12 +- .../issue_46505_prime_6.crash_dart.expect | 2 +- ...6505_prime_6.crash_dart.intertwined.expect | 4 +- .../issue_48371_prime3.dart.expect | 2 +- ...issue_48371_prime3.dart.intertwined.expect | 4 +- .../error_recovery/issue_48411.dart.expect | 14 +- .../issue_48411.dart.intertwined.expect | 28 +- .../issue_48411_prime.dart.expect | 14 +- .../issue_48411_prime.dart.intertwined.expect | 28 +- .../issue_48411_prime_1.dart.expect | 8 +- ...ssue_48411_prime_1.dart.intertwined.expect | 16 +- .../error_recovery/issue_49116.dart.expect | 2 +- .../issue_49116.dart.intertwined.expect | 4 +- .../keyword_named_class_fields.dart.expect | 2 +- ...named_class_fields.dart.intertwined.expect | 4 +- .../keyword_named_class_methods.dart.expect | 2 +- ...amed_class_methods.dart.intertwined.expect | 4 +- ...ameter_start_of_next_top_level.dart.expect | 2 +- ..._of_next_top_level.dart.intertwined.expect | 4 +- .../method_called_with.dart.expect | 2 +- ...method_called_with.dart.intertwined.expect | 4 +- .../method_called_with_prime.dart.expect | 2 +- ..._called_with_prime.dart.intertwined.expect | 4 +- .../method_called_with_prime2.dart.expect | 4 +- ...called_with_prime2.dart.intertwined.expect | 8 +- .../extension_named_type.dart.expect | 2 +- ...tension_named_type.dart.intertwined.expect | 4 +- .../extension_type.dart.expect | 2 +- .../extension_type.dart.intertwined.expect | 4 +- .../extensions/covariant.dart.expect | 4 +- .../covariant.dart.intertwined.expect | 8 +- .../extensions/not_covariant.dart.expect | 4 +- .../not_covariant.dart.intertwined.expect | 8 +- .../extensions/static.dart.expect | 4 +- .../extensions/static.dart.intertwined.expect | 8 +- .../extensions/static_covariant.dart.expect | 4 +- .../static_covariant.dart.intertwined.expect | 8 +- .../general/augment_super.dart.expect | 2 +- .../augment_super.dart.intertwined.expect | 4 +- ...ilt_in_identifier_class_fields.dart.expect | 2 +- ...ifier_class_fields.dart.intertwined.expect | 4 +- ...lt_in_identifier_class_methods.dart.expect | 2 +- ...fier_class_methods.dart.intertwined.expect | 4 +- .../general/issue_41121.dart.expect | 4 +- .../issue_41121.dart.intertwined.expect | 8 +- .../general/issue_45703.dart.expect | 4 +- .../issue_45703.dart.intertwined.expect | 8 +- .../general/metadata.dart.expect | 4 +- .../general/metadata.dart.intertwined.expect | 8 +- .../general/new_as_identifier.dart.expect | 4 +- .../new_as_identifier.dart.intertwined.expect | 8 +- .../general/operator_01.dart.expect | 2 +- .../operator_01.dart.intertwined.expect | 4 +- .../operator_hat_class.crash_dart.expect | 2 +- ...or_hat_class.crash_dart.intertwined.expect | 4 +- .../inline_class/inline_class.dart.expect | 4 +- .../inline_class.dart.intertwined.expect | 8 +- .../macros/augment_class.dart.expect | 8 +- .../augment_class.dart.intertwined.expect | 16 +- .../macros/macro_class.dart.expect | 8 +- .../macro_class.dart.intertwined.expect | 16 +- .../mixin_class/mixin_class.dart | 6 + .../mixin_class/mixin_class.dart.expect | 62 ++++ .../mixin_class.dart.intertwined.expect | 109 +++++++ .../mixin_class.dart.parser.expect | 15 + .../mixin_class.dart.scanner.expect | 15 + .../abstract_placement.dart.expect | 4 +- ...abstract_placement.dart.intertwined.expect | 8 +- .../external_placement.dart.expect | 2 +- ...external_placement.dart.intertwined.expect | 4 +- .../late_without_var_etc.dart.expect | 2 +- ...te_without_var_etc.dart.intertwined.expect | 4 +- .../nnbd/issue_39723.dart.expect | 2 +- .../nnbd/issue_39723.dart.intertwined.expect | 4 +- .../nnbd/issue_39723_prime.dart.expect | 2 +- .../issue_39723_prime.dart.intertwined.expect | 4 +- .../nnbd/issue_39858.dart.expect | 2 +- .../nnbd/issue_39858.dart.intertwined.expect | 4 +- .../nnbd/issue_39858_prime1.dart.expect | 2 +- ...issue_39858_prime1.dart.intertwined.expect | 4 +- .../nnbd/issue_40805_01.dart.expect | 2 +- .../issue_40805_01.dart.intertwined.expect | 4 +- .../nnbd/issue_40805_02.dart.expect | 2 +- .../issue_40805_02.dart.intertwined.expect | 4 +- .../nnbd/issue_40805_03.dart.expect | 2 +- .../issue_40805_03.dart.intertwined.expect | 4 +- .../nnbd/issue_40834_01.dart.expect | 2 +- .../issue_40834_01.dart.intertwined.expect | 4 +- .../nnbd/issue_40834_02.dart.expect | 2 +- .../issue_40834_02.dart.intertwined.expect | 4 +- .../nnbd/issue_40834_03.dart.expect | 2 +- .../issue_40834_03.dart.intertwined.expect | 4 +- .../nnbd/issue_41597.dart.expect | 2 +- .../nnbd/issue_41597.dart.intertwined.expect | 4 +- .../nnbd/issue_42621.dart.expect | 2 +- .../nnbd/issue_42621.dart.intertwined.expect | 4 +- .../nnbd/issue_49132.dart.expect | 2 +- .../nnbd/issue_49132.dart.intertwined.expect | 4 +- .../nnbd/issue_49132_not_nullable.dart.expect | 2 +- ...49132_not_nullable.dart.intertwined.expect | 4 +- .../nnbd/issue_49132_prime.dart.expect | 2 +- .../issue_49132_prime.dart.intertwined.expect | 4 +- .../nnbd/late_member.dart.expect | 4 +- .../nnbd/late_member.dart.intertwined.expect | 8 +- .../nnbd/late_modifier.dart.expect | 4 +- .../late_modifier.dart.intertwined.expect | 8 +- .../nnbd/null_shorting_index.dart.expect | 2 +- ...ull_shorting_index.dart.intertwined.expect | 4 +- .../nnbd/required_member.dart.expect | 4 +- .../required_member.dart.intertwined.expect | 8 +- .../nnbd/required_modifier.dart.expect | 4 +- .../required_modifier.dart.intertwined.expect | 8 +- .../define_triple_shift_method.dart.expect | 2 +- ...riple_shift_method.dart.intertwined.expect | 4 +- ...fine_triple_shift_method_prime.dart.expect | 2 +- ...shift_method_prime.dart.intertwined.expect | 4 +- .../triple_shift_not_triple_shift.dart.expect | 2 +- ...t_not_triple_shift.dart.intertwined.expect | 4 +- .../non-nnbd/issue_40288.dart.expect | 6 +- .../issue_40288.dart.intertwined.expect | 12 +- .../non-nnbd/issue_40288_prime.dart.expect | 6 +- .../issue_40288_prime.dart.intertwined.expect | 12 +- .../nullable_type_argument.dart.expect | 4 +- ...able_type_argument.dart.intertwined.expect | 8 +- .../non-nnbd/use_late_in_non_nnbd.dart.expect | 2 +- ...e_late_in_non_nnbd.dart.intertwined.expect | 4 +- .../use_required_in_non_nnbd.dart.expect | 2 +- ...quired_in_non_nnbd.dart.intertwined.expect | 4 +- .../cast_inside_extractor_pattern.dart.expect | 2 +- ..._extractor_pattern.dart.intertwined.expect | 4 +- ...actor_pattern_implicitly_named.dart.expect | 2 +- ...n_implicitly_named.dart.intertwined.expect | 4 +- .../extractor_pattern_inside_cast.dart.expect | 2 +- ...attern_inside_cast.dart.intertwined.expect | 4 +- ...tor_pattern_inside_null_assert.dart.expect | 2 +- ...inside_null_assert.dart.intertwined.expect | 4 +- ...ctor_pattern_inside_null_check.dart.expect | 2 +- ..._inside_null_check.dart.intertwined.expect | 4 +- ...tractor_pattern_with_type_args.dart.expect | 2 +- ...ern_with_type_args.dart.intertwined.expect | 4 +- ...h_type_args_inside_null_assert.dart.expect | 2 +- ...inside_null_assert.dart.intertwined.expect | 4 +- ...ssert_inside_extractor_pattern.dart.expect | 2 +- ..._extractor_pattern.dart.intertwined.expect | 4 +- ...actor_pattern_implicitly_named.dart.expect | 2 +- ...n_implicitly_named.dart.intertwined.expect | 4 +- ...check_inside_extractor_pattern.dart.expect | 2 +- ..._extractor_pattern.dart.intertwined.expect | 4 +- ...actor_pattern_implicitly_named.dart.expect | 2 +- ...n_implicitly_named.dart.intertwined.expect | 4 +- ...withTypeArgs_insideDeclaration.dart.expect | 2 +- ..._insideDeclaration.dart.intertwined.expect | 4 +- ...ional_inside_extractor_pattern.dart.expect | 2 +- ..._extractor_pattern.dart.intertwined.expect | 4 +- ...ed_as_inside_extractor_pattern.dart.expect | 2 +- ..._extractor_pattern.dart.intertwined.expect | 4 +- ...actor_pattern_implicitly_named.dart.expect | 2 +- ...n_implicitly_named.dart.intertwined.expect | 4 +- ...eter_with_explicit_record_type.dart.expect | 2 +- ...plicit_record_type.dart.intertwined.expect | 4 +- .../modifier_before_type_question.dart.expect | 2 +- ...fore_type_question.dart.intertwined.expect | 4 +- .../operator_returning_record.dart.expect | 4 +- ...r_returning_record.dart.intertwined.expect | 8 +- .../record/record_type_03.dart.expect | 2 +- .../record_type_03.dart.intertwined.expect | 4 +- .../record/record_type_getter.dart.expect | 4 +- ...record_type_getter.dart.intertwined.expect | 8 +- .../record/record_type_setter.dart.expect | 4 +- ...record_type_setter.dart.intertwined.expect | 8 +- .../record_type_with_modifiers.dart.expect | 2 +- ...ype_with_modifiers.dart.intertwined.expect | 4 +- .../super_parameters_record_type.dart.expect | 2 +- ...meters_record_type.dart.intertwined.expect | 4 +- .../sealed_class/sealed_class.dart.expect | 4 +- .../sealed_class.dart.intertwined.expect | 8 +- pkg/front_end/test/parser_test_listener.dart | 6 + .../test/parser_test_listener_creator.dart | 1 + pkg/front_end/test/parser_test_parser.dart | 12 +- .../test/parser_test_parser_creator.dart | 1 + .../general/mixin_class_declaration.dart | 10 + ...ss_declaration.dart.textual_outline.expect | 6 + .../mixin_class_declaration.dart.weak.expect | 39 +++ ...class_declaration.dart.weak.modular.expect | 39 +++ ...class_declaration.dart.weak.outline.expect | 37 +++ ...s_declaration.dart.weak.transformed.expect | 39 +++ .../testcases/mixin_class/folder.options | 1 + .../mixin_class/mixin_class_declaration.dart | 10 + ...mixin_class_declaration.dart.strong.expect | 21 ++ ...declaration.dart.strong.transformed.expect | 21 ++ ...ss_declaration.dart.textual_outline.expect | 6 + .../mixin_class_declaration.dart.weak.expect | 21 ++ ...class_declaration.dart.weak.modular.expect | 21 ++ ...class_declaration.dart.weak.outline.expect | 19 ++ ...s_declaration.dart.weak.transformed.expect | 21 ++ .../testcases/textual_outline.status | 2 + .../_fasta/parser_ast_helper_creator.dart | 1 + ...ixin_class_syntax_disabled_error_test.dart | 22 ++ 299 files changed, 1732 insertions(+), 1011 deletions(-) create mode 100644 pkg/front_end/parser_testcases/mixin_class/mixin_class.dart create mode 100644 pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.expect create mode 100644 pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.intertwined.expect create mode 100644 pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.parser.expect create mode 100644 pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.scanner.expect create mode 100644 pkg/front_end/testcases/general/mixin_class_declaration.dart create mode 100644 pkg/front_end/testcases/general/mixin_class_declaration.dart.textual_outline.expect create mode 100644 pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.expect create mode 100644 pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.modular.expect create mode 100644 pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.outline.expect create mode 100644 pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.transformed.expect create mode 100644 pkg/front_end/testcases/mixin_class/folder.options create mode 100644 pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart create mode 100644 pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.strong.expect create mode 100644 pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.strong.transformed.expect create mode 100644 pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.textual_outline.expect create mode 100644 pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.expect create mode 100644 pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.modular.expect create mode 100644 pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.outline.expect create mode 100644 pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.transformed.expect create mode 100644 tests/language/mixin_class/mixin_class_syntax_disabled_error_test.dart 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 2783de53e40..2e2c6ae2013 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart @@ -74,9 +74,10 @@ class ForwardingListener implements Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { listener?.beginClassDeclaration(begin, abstractToken, macroToken, - inlineToken, sealedToken, augmentToken, name); + inlineToken, sealedToken, augmentToken, mixinToken, name); } @override @@ -404,9 +405,10 @@ class ForwardingListener implements Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { listener?.beginNamedMixinApplication(begin, abstractToken, macroToken, - inlineToken, sealedToken, augmentToken, name); + inlineToken, sealedToken, augmentToken, mixinToken, name); } @override diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart index aef6701aebd..f7e2bd2b4e2 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart @@ -140,6 +140,7 @@ class Listener implements UnescapeErrorListener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) {} /// Handle an extends clause in a class declaration. Substructures: @@ -785,6 +786,7 @@ class Listener implements UnescapeErrorListener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) {} /// Handle a named mixin application with clause (e.g. "A with B, C"). 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 51fbd21dbe2..2f234c5a3ca 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart @@ -619,13 +619,8 @@ class Parser { assert(keyword.isTopLevelKeyword); final String? value = keyword.stringValue; if (identical(value, 'class')) { - directiveState?.checkDeclaration(); - ModifierContext context = new ModifierContext(this); - context.parseClassModifiers(start, keyword); - Token? abstractToken = context.abstractToken; - Token? augmentToken = context.augmentToken; - return parseClassOrNamedMixinApplication(abstractToken, macroToken, - inlineToken, sealedToken, augmentToken, keyword); + return _handleModifiersForClassDeclaration(start, keyword, macroToken, + inlineToken, sealedToken, null, directiveState); } else if (identical(value, 'enum')) { directiveState?.checkDeclaration(); ModifierContext context = new ModifierContext(this); @@ -683,6 +678,10 @@ class Parser { directiveState?.checkDeclaration(); return parseTypedef(keyword); } else if (identical(value, 'mixin')) { + if (identical(nextValue, 'class')) { + return _handleModifiersForClassDeclaration(start, keyword.next!, + macroToken, inlineToken, sealedToken, keyword, directiveState); + } context.parseMixinModifiers(start, keyword); directiveState?.checkDeclaration(); return parseMixin(context.augmentToken, sealedToken, keyword); @@ -710,6 +709,27 @@ class Parser { throw "Internal error: Unhandled top level keyword '$value'."; } + Token _handleModifiersForClassDeclaration( + Token start, + Token classKeyword, + Token? macroToken, + Token? inlineToken, + Token? sealedToken, + Token? mixinToken, + DirectiveContext? directiveState) { + directiveState?.checkDeclaration(); + ModifierContext context = new ModifierContext(this); + if (mixinToken != null) { + context.parseClassModifiers(start, mixinToken); + } else { + context.parseClassModifiers(start, classKeyword); + } + Token? abstractToken = context.abstractToken; + Token? augmentToken = context.augmentToken; + return parseClassOrNamedMixinApplication(abstractToken, macroToken, + inlineToken, sealedToken, augmentToken, mixinToken, classKeyword); + } + bool _isIdentifierOrQuestionIdentifier(Token token) { if (token.isIdentifier) return true; if (optional("?", token)) { @@ -2467,6 +2487,7 @@ class Parser { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token classKeyword) { assert(optional('class', classKeyword)); Token begin = abstractToken ?? classKeyword; @@ -2481,11 +2502,11 @@ class Parser { } if (optional('=', token.next!)) { listener.beginNamedMixinApplication(begin, abstractToken, macroToken, - inlineToken, sealedToken, augmentToken, name); + inlineToken, sealedToken, augmentToken, mixinToken, name); return parseNamedMixinApplication(token, begin, classKeyword); } else { listener.beginClassDeclaration(begin, abstractToken, macroToken, - inlineToken, sealedToken, augmentToken, name); + inlineToken, sealedToken, augmentToken, mixinToken, name); return parseClass(token, begin, classKeyword, name.lexeme); } } diff --git a/pkg/analyzer/lib/src/dart/ast/ast.dart b/pkg/analyzer/lib/src/dart/ast/ast.dart index 42161b8064f..f3db96f49de 100644 --- a/pkg/analyzer/lib/src/dart/ast/ast.dart +++ b/pkg/analyzer/lib/src/dart/ast/ast.dart @@ -1913,6 +1913,9 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl /// The 'augment' keyword, or `null` if the keyword was absent. final Token? augmentKeyword; + /// The 'mixin' keyword, or `null` if the keyword was absent. + final Token? mixinKeyword; + /// The token representing the 'class' keyword. @override final Token classKeyword; @@ -1967,6 +1970,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl required this.inlineKeyword, required this.sealedKeyword, required this.augmentKeyword, + required this.mixinKeyword, required this.classKeyword, required super.name, required TypeParameterListImpl? typeParameters, @@ -2011,6 +2015,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl inlineKeyword ?? sealedKeyword ?? augmentKeyword ?? + mixinKeyword ?? classKeyword; } @@ -2052,6 +2057,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl ..addToken('inlineKeyword', inlineKeyword) ..addToken('sealedKeyword', sealedKeyword) ..addToken('augmentKeyword', augmentKeyword) + ..addToken('mixinKeyword', mixinKeyword) ..addToken('classKeyword', classKeyword) ..addToken('name', name) ..addNode('typeParameters', typeParameters) @@ -2127,6 +2133,10 @@ class ClassTypeAliasImpl extends TypeAliasImpl implements ClassTypeAlias { /// augmentation class. final Token? augmentKeyword; + /// The token for the 'mixin' keyword, or `null` if this is not defining a + /// mixin class. + final Token? mixinKeyword; + /// The name of the superclass of the class being declared. NamedTypeImpl _superclass; @@ -2158,6 +2168,7 @@ class ClassTypeAliasImpl extends TypeAliasImpl implements ClassTypeAlias { required this.inlineKeyword, required this.sealedKeyword, required this.augmentKeyword, + required this.mixinKeyword, required NamedTypeImpl superclass, required WithClauseImpl withClause, required ImplementsClauseImpl? implementsClause, @@ -2183,6 +2194,7 @@ class ClassTypeAliasImpl extends TypeAliasImpl implements ClassTypeAlias { inlineKeyword ?? sealedKeyword ?? augmentKeyword ?? + mixinKeyword ?? typedefKeyword; } @@ -2225,6 +2237,7 @@ class ClassTypeAliasImpl extends TypeAliasImpl implements ClassTypeAlias { ..addToken('macroKeyword', macroKeyword) ..addToken('sealedKeyword', sealedKeyword) ..addToken('augmentKeyword', augmentKeyword) + ..addToken('mixinKeyword', mixinKeyword) ..addNode('superclass', superclass) ..addNode('withClause', withClause) ..addNode('implementsClause', implementsClause) diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart index 47adbce1340..8f2a513749d 100644 --- a/pkg/analyzer/lib/src/fasta/ast_builder.dart +++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart @@ -223,6 +223,7 @@ class AstBuilder extends StackListener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { assert(_classLikeBuilder == null); push(_Modifiers()..abstractKeyword = abstractToken); @@ -255,11 +256,20 @@ class AstBuilder extends StackListener { // Pretend that 'sealed' didn't occur while this feature is incomplete. sealedToken = null; } + if (mixinToken != null) { + _reportFeatureNotEnabled( + feature: ExperimentalFeatures.sealed_class, + startToken: mixinToken, + ); + // Pretend that 'mixin' didn't occur while this feature is incomplete. + mixinToken = null; + } } push(macroToken ?? NullValue.Token); push(inlineToken ?? NullValue.Token); push(sealedToken ?? NullValue.Token); push(augmentToken ?? NullValue.Token); + push(mixinToken ?? NullValue.Token); } @override @@ -405,6 +415,7 @@ class AstBuilder extends StackListener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { push(_Modifiers()..abstractKeyword = abstractToken); if (!enableMacros) { @@ -436,11 +447,20 @@ class AstBuilder extends StackListener { // Pretend that 'sealed' didn't occur while this feature is incomplete. sealedToken = null; } + if (mixinToken != null) { + _reportFeatureNotEnabled( + feature: ExperimentalFeatures.sealed_class, + startToken: mixinToken, + ); + // Pretend that 'mixin' didn't occur while this feature is incomplete. + mixinToken = null; + } } push(macroToken ?? NullValue.Token); push(inlineToken ?? NullValue.Token); push(sealedToken ?? NullValue.Token); push(augmentToken ?? NullValue.Token); + push(mixinToken ?? NullValue.Token); } @override @@ -650,6 +670,7 @@ class AstBuilder extends StackListener { inlineKeyword: null, sealedKeyword: null, augmentKeyword: null, + mixinKeyword: null, classKeyword: Token(Keyword.CLASS, 0), name: StringToken(TokenType.STRING, className, -1), typeParameters: null, @@ -2644,6 +2665,7 @@ class AstBuilder extends StackListener { typeArguments: null, question: null); } + var mixinKeyword = pop(NullValue.Token) as Token?; var augmentKeyword = pop(NullValue.Token) as Token?; var sealedKeyword = pop(NullValue.Token) as Token?; var inlineKeyword = pop(NullValue.Token) as Token?; @@ -2667,6 +2689,7 @@ class AstBuilder extends StackListener { inlineKeyword: inlineKeyword, sealedKeyword: sealedKeyword, augmentKeyword: augmentKeyword, + mixinKeyword: mixinKeyword, superclass: superclass, withClause: withClause, implementsClause: implementsClause, @@ -3627,6 +3650,7 @@ class AstBuilder extends StackListener { pop(NullValue.IdentifierList) as ImplementsClauseImpl?; var withClause = pop(NullValue.WithClause) as WithClauseImpl?; var extendsClause = pop(NullValue.ExtendsClause) as ExtendsClauseImpl?; + var mixinKeyword = pop(NullValue.Token) as Token?; var augmentKeyword = pop(NullValue.Token) as Token?; var sealedKeyword = pop(NullValue.Token) as Token?; var inlineKeyword = pop(NullValue.Token) as Token?; @@ -3647,6 +3671,7 @@ class AstBuilder extends StackListener { inlineKeyword: inlineKeyword, sealedKeyword: sealedKeyword, augmentKeyword: augmentKeyword, + mixinKeyword: mixinKeyword, classKeyword: classKeyword, name: name.token, typeParameters: typeParameters, @@ -5547,6 +5572,7 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder { final Token? inlineKeyword; final Token? sealedKeyword; final Token? augmentKeyword; + final Token? mixinKeyword; final Token classKeyword; final Token name; ExtendsClauseImpl? extendsClause; @@ -5565,6 +5591,7 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder { required this.inlineKeyword, required this.sealedKeyword, required this.augmentKeyword, + required this.mixinKeyword, required this.classKeyword, required this.name, required this.extendsClause, @@ -5582,6 +5609,7 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder { inlineKeyword: inlineKeyword, sealedKeyword: sealedKeyword, augmentKeyword: augmentKeyword, + mixinKeyword: mixinKeyword, classKeyword: classKeyword, name: name, typeParameters: typeParameters, diff --git a/pkg/analyzer/test/generated/parser_fasta_listener.dart b/pkg/analyzer/test/generated/parser_fasta_listener.dart index ba58aafb970..a99c8369f34 100644 --- a/pkg/analyzer/test/generated/parser_fasta_listener.dart +++ b/pkg/analyzer/test/generated/parser_fasta_listener.dart @@ -93,9 +93,10 @@ class ForwardingTestListener extends ForwardingListener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { super.beginClassDeclaration(beginToken, abstractToken, macroToken, - inlineToken, sealedToken, augmentToken, name); + inlineToken, sealedToken, augmentToken, mixinToken, name); begin('ClassDeclaration'); } @@ -407,9 +408,10 @@ class ForwardingTestListener extends ForwardingListener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { super.beginNamedMixinApplication(beginToken, abstractToken, macroToken, - inlineToken, sealedToken, augmentToken, name); + inlineToken, sealedToken, augmentToken, mixinToken, name); begin('NamedMixinApplication'); } diff --git a/pkg/analyzer/test/src/fasta/ast_builder_test.dart b/pkg/analyzer/test/src/fasta/ast_builder_test.dart index f07d1b03796..53b45d92a54 100644 --- a/pkg/analyzer/test/src/fasta/ast_builder_test.dart +++ b/pkg/analyzer/test/src/fasta/ast_builder_test.dart @@ -314,6 +314,23 @@ ClassDeclaration '''); } + void test_class_mixin() { + var parseResult = parseStringWithErrors(r''' +mixin class A {} +'''); + parseResult.assertNoErrors(); + + var node = parseResult.findNode.classDeclaration('class A {}'); + assertParsedNodeText(node, r''' +ClassDeclaration + mixinKeyword: mixin + classKeyword: class + name: A + leftBracket: { + rightBracket: } +'''); + } + void test_class_sealed() { var parseResult = parseStringWithErrors(r''' sealed class A {} @@ -405,6 +422,33 @@ ClassTypeAlias '''); } + void test_classAlias_mixin() { + var parseResult = parseStringWithErrors(r''' +mixin M {} +mixin class A = Object with M; +'''); + parseResult.assertNoErrors(); + + var node = parseResult.findNode.classTypeAlias('class A'); + assertParsedNodeText(node, r''' +ClassTypeAlias + typedefKeyword: class + name: A + equals: = + mixinKeyword: mixin + superclass: NamedType + name: SimpleIdentifier + token: Object + withClause: WithClause + withKeyword: with + mixinTypes + NamedType + name: SimpleIdentifier + token: M + semicolon: ; +'''); + } + void test_classAlias_notNamedType() { var parseResult = parseStringWithErrors(r''' class C = A Function() with M; diff --git a/pkg/analyzer/test/src/fasta/recovery/partial_code/mixin_declaration_test.dart b/pkg/analyzer/test/src/fasta/recovery/partial_code/mixin_declaration_test.dart index 6a81c41326a..fe0d0b44cd9 100644 --- a/pkg/analyzer/test/src/fasta/recovery/partial_code/mixin_declaration_test.dart +++ b/pkg/analyzer/test/src/fasta/recovery/partial_code/mixin_declaration_test.dart @@ -23,7 +23,7 @@ class MixinDeclarationTest extends PartialCodeTest { ParserErrorCode.EXPECTED_BODY ], 'mixin _s_ {}', - failing: ['functionNonVoid', 'getter']), + failing: ['class', 'functionNonVoid', 'getter']), TestDescriptor('named', 'mixin A', [ParserErrorCode.EXPECTED_BODY], 'mixin A {}'), TestDescriptor( diff --git a/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart b/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart index 70bc62fee99..59a741e3591 100644 --- a/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart +++ b/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart @@ -495,6 +495,7 @@ class _MacroListener implements Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { _unexpected(); } @@ -819,6 +820,7 @@ class _MacroListener implements Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { _unexpected(); } diff --git a/pkg/front_end/lib/src/fasta/source/diet_listener.dart b/pkg/front_end/lib/src/fasta/source/diet_listener.dart index 325a3ce3197..fd1a27ed59a 100644 --- a/pkg/front_end/lib/src/fasta/source/diet_listener.dart +++ b/pkg/front_end/lib/src/fasta/source/diet_listener.dart @@ -941,6 +941,7 @@ class DietListener extends StackListenerImpl { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { debugEvent("beginClassDeclaration"); push(begin); diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart index ae4e9e088ac..5ac08c083c6 100644 --- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart @@ -868,6 +868,7 @@ class OutlineBuilder extends StackListenerImpl { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { debugEvent("beginClassDeclaration"); popDeclarationContext( @@ -894,6 +895,12 @@ class OutlineBuilder extends StackListenerImpl { sealedToken = null; } } + if (mixinToken != null) { + if (reportIfNotEnabled(libraryFeatures.sealedClass, mixinToken.charOffset, + mixinToken.length)) { + mixinToken = null; + } + } if (inlineToken != null) { libraryBuilder.currentTypeParameterScopeBuilder .markAsInlineClassDeclaration( @@ -909,6 +916,7 @@ class OutlineBuilder extends StackListenerImpl { push(inlineToken ?? NullValue.Token); push(sealedToken ?? NullValue.Token); push(augmentToken ?? NullValue.Token); + push(mixinToken ?? NullValue.Token); } @override @@ -996,6 +1004,7 @@ class OutlineBuilder extends StackListenerImpl { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { debugEvent("beginNamedMixinApplication"); popDeclarationContext( @@ -1025,10 +1034,17 @@ class OutlineBuilder extends StackListenerImpl { sealedToken = null; } } + if (mixinToken != null) { + if (reportIfNotEnabled(libraryFeatures.sealedClass, mixinToken.charOffset, + mixinToken.length)) { + mixinToken = null; + } + } push(macroToken ?? NullValue.Token); push(inlineToken ?? NullValue.Token); push(sealedToken ?? NullValue.Token); push(augmentToken ?? NullValue.Token); + push(mixinToken ?? NullValue.Token); } @override @@ -1181,6 +1197,7 @@ class OutlineBuilder extends StackListenerImpl { ValueKinds.TypeBuilderOrNull, ValueKinds.ParserRecovery, ]), + /* mixin token */ ValueKinds.TokenOrNull, /* augment token */ ValueKinds.TokenOrNull, /* sealed token */ ValueKinds.TokenOrNull, /* inline token */ ValueKinds.TokenOrNull, @@ -1199,6 +1216,7 @@ class OutlineBuilder extends StackListenerImpl { as MixinApplicationBuilder?; int supertypeOffset = popCharOffset(); TypeBuilder? supertype = nullIfParserRecovery(pop()) as TypeBuilder?; + Token? mixinToken = pop(NullValue.Token) as Token?; Token? augmentToken = pop(NullValue.Token) as Token?; Token? sealedToken = pop(NullValue.Token) as Token?; // TODO(johnniwinther): Create builder for inline. @@ -1299,7 +1317,8 @@ class OutlineBuilder extends StackListenerImpl { supertypeOffset, isMacro: macroToken != null, isSealed: sealedToken != null, - isAugmentation: augmentToken != null); + isAugmentation: augmentToken != null, + isMixinClass: mixinToken != null); } } libraryBuilder.setCurrentClassName(null); @@ -2153,6 +2172,7 @@ class OutlineBuilder extends StackListenerImpl { ValueKinds.ParserRecovery, ValueKinds.TypeBuilder, ]), + /* mixin token */ ValueKinds.TokenOrNull, /* augment token */ ValueKinds.TokenOrNull, /* sealed token */ ValueKinds.TokenOrNull, /* inline token */ ValueKinds.TokenOrNull, @@ -2169,6 +2189,7 @@ class OutlineBuilder extends StackListenerImpl { as List?; Object? mixinApplication = pop(); Object? supertype = pop(); + Token? mixinToken = pop(NullValue.Token) as Token?; Token? augmentToken = pop(NullValue.Token) as Token?; Token? sealedToken = pop(NullValue.Token) as Token?; // TODO(johnniwinther): Report error on 'inline' here; it can't be used on @@ -2251,7 +2272,8 @@ class OutlineBuilder extends StackListenerImpl { charEndOffset, isMacro: macroToken != null, isSealed: sealedToken != null, - isAugmentation: augmentToken != null); + isAugmentation: augmentToken != null, + isMixinClass: mixinToken != null); } popDeclarationContext(DeclarationContext.NamedMixinApplication); } diff --git a/pkg/front_end/lib/src/fasta/source/source_class_builder.dart b/pkg/front_end/lib/src/fasta/source/source_class_builder.dart index d1830c4d46a..3b0d8f9b293 100644 --- a/pkg/front_end/lib/src/fasta/source/source_class_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/source_class_builder.dart @@ -112,6 +112,9 @@ class SourceClassBuilder extends ClassBuilderImpl @override final bool isAugmentation; + // TODO(kallentu): Finish AST implementation for mixin classes. + final bool isMixinClass; + @override bool isMixinDeclaration; @@ -154,7 +157,8 @@ class SourceClassBuilder extends ClassBuilderImpl this.isMixinDeclaration = false, this.isMacro = false, this.isSealed = false, - this.isAugmentation = false}) + this.isAugmentation = false, + this.isMixinClass = false}) : actualCls = initializeClass(cls, typeVariables, name, parent, startCharOffset, nameOffset, charEndOffset, referencesFromIndexed, isAugmentation: isAugmentation), diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart index 77f7ed5a50c..70a35338330 100644 --- a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart @@ -1789,7 +1789,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { int supertypeOffset, {required bool isMacro, required bool isSealed, - required bool isAugmentation}) { + required bool isAugmentation, + required bool isMixinClass}) { _addClass( TypeParameterScopeKind.classDeclaration, metadata, @@ -1805,7 +1806,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { supertypeOffset, isMacro: isMacro, isSealed: isSealed, - isAugmentation: isAugmentation); + isAugmentation: isAugmentation, + isMixinClass: isMixinClass); } void addMixinDeclaration( @@ -1847,7 +1849,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { supertypeOffset, isMacro: false, isSealed: isSealed, - isAugmentation: isAugmentation); + isAugmentation: isAugmentation, + isMixinClass: false); } void _addClass( @@ -1865,7 +1868,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { int supertypeOffset, {required bool isMacro, required bool isSealed, - required bool isAugmentation}) { + required bool isAugmentation, + required bool isMixinClass}) { // Nested declaration began in `OutlineBuilder.beginClassDeclaration`. TypeParameterScopeBuilder declaration = endNestedDeclaration(kind, className) @@ -1905,7 +1909,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { isMacro: false, isSealed: false, // TODO(johnniwinther): How can we support class with mixins? - isAugmentation: false), + isAugmentation: false, + isMixinClass: false), interfaces, // TODO(johnniwinther): Add the `on` clause types of a mixin declaration // here. @@ -1921,7 +1926,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { isMixinDeclaration: isMixinDeclaration, isMacro: isMacro, isSealed: isSealed, - isAugmentation: isAugmentation); + isAugmentation: isAugmentation, + isMixinClass: isMixinClass); constructorReferences.clear(); Map? typeVariablesByName = @@ -2274,7 +2280,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { List? interfaces, required bool isMacro, required bool isSealed, - required bool isAugmentation}) { + required bool isAugmentation, + required bool isMixinClass}) { if (name == null) { // The following parameters should only be used when building a named // mixin application. @@ -2510,7 +2517,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { mixedInTypeBuilder: isMixinDeclaration ? null : mixin, isMacro: isNamedMixinApplication && isMacro, isSealed: isNamedMixinApplication && isSealed, - isAugmentation: isNamedMixinApplication && isAugmentation); + isAugmentation: isNamedMixinApplication && isAugmentation, + isMixinClass: isNamedMixinApplication && isMixinClass); // TODO(ahe, kmillikin): Should always be true? // pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart can't // handle that :( @@ -2570,7 +2578,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { int charEndOffset, {required bool isMacro, required bool isSealed, - required bool isAugmentation}) { + required bool isAugmentation, + required bool isMixinClass}) { // Nested declaration began in `OutlineBuilder.beginNamedMixinApplication`. endNestedDeclaration(TypeParameterScopeKind.namedMixinApplication, name) .resolveNamedTypes(typeVariables, this); @@ -2583,7 +2592,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { interfaces: interfaces, isMacro: isMacro, isSealed: isSealed, - isAugmentation: isAugmentation)!; + isAugmentation: isAugmentation, + isMixinClass: isMixinClass)!; checkTypeVariables(typeVariables, supertype.declaration); } @@ -3084,7 +3094,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl { typeVariables: typeVariables, isMacro: false, isSealed: false, - isAugmentation: false), + isAugmentation: false, + isMixinClass: false), interfaceBuilders, enumConstantInfos, this, diff --git a/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart b/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart index 61f9c132d18..38e3542e5f4 100644 --- a/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart +++ b/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart @@ -183,6 +183,7 @@ abstract class AbstractParserAstListener implements Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { ClassDeclarationBegin data = new ClassDeclarationBegin(ParserAstType.BEGIN, begin: begin, @@ -191,6 +192,7 @@ abstract class AbstractParserAstListener implements Listener { inlineToken: inlineToken, sealedToken: sealedToken, augmentToken: augmentToken, + mixinToken: mixinToken, name: name); seen(data); } @@ -969,6 +971,7 @@ abstract class AbstractParserAstListener implements Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { NamedMixinApplicationBegin data = new NamedMixinApplicationBegin( ParserAstType.BEGIN, @@ -978,6 +981,7 @@ abstract class AbstractParserAstListener implements Listener { inlineToken: inlineToken, sealedToken: sealedToken, augmentToken: augmentToken, + mixinToken: mixinToken, name: name); seen(data); } @@ -3205,6 +3209,7 @@ class ClassDeclarationBegin extends ParserAstNode { final Token? inlineToken; final Token? sealedToken; final Token? augmentToken; + final Token? mixinToken; final Token name; ClassDeclarationBegin(ParserAstType type, @@ -3214,6 +3219,7 @@ class ClassDeclarationBegin extends ParserAstNode { this.inlineToken, this.sealedToken, this.augmentToken, + this.mixinToken, required this.name}) : super("ClassDeclaration", type); @@ -3225,6 +3231,7 @@ class ClassDeclarationBegin extends ParserAstNode { "inlineToken": inlineToken, "sealedToken": sealedToken, "augmentToken": augmentToken, + "mixinToken": mixinToken, "name": name, }; } @@ -4619,6 +4626,7 @@ class NamedMixinApplicationBegin extends ParserAstNode { final Token? inlineToken; final Token? sealedToken; final Token? augmentToken; + final Token? mixinToken; final Token name; NamedMixinApplicationBegin(ParserAstType type, @@ -4628,6 +4636,7 @@ class NamedMixinApplicationBegin extends ParserAstNode { this.inlineToken, this.sealedToken, this.augmentToken, + this.mixinToken, required this.name}) : super("NamedMixinApplication", type); @@ -4639,6 +4648,7 @@ class NamedMixinApplicationBegin extends ParserAstNode { "inlineToken": inlineToken, "sealedToken": sealedToken, "augmentToken": augmentToken, + "mixinToken": mixinToken, "name": name, }; } diff --git a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect index f3c5c7e5884..97d5f416532 100644 --- a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect +++ b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect @@ -185,7 +185,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, augment, Class) + beginClassDeclaration(class, null, null, null, null, augment, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect index 4895683f4f3..f1d8113bc35 100644 --- a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect @@ -412,12 +412,12 @@ parseUnit(augment) listener: beginMetadataStar(augment) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, augment, class) + parseClassOrNamedMixinApplication(null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, augment, Class) + listener: beginClassDeclaration(class, null, null, null, null, augment, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) diff --git a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect index 1741bf86886..7f4072531df 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, Class) + beginClassDeclaration(class, null, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect index 50cabb6daa2..3a7b860759b 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) diff --git a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect index bc33dc0492e..bf8c93c90a1 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, Class) + beginClassDeclaration(class, null, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect index cfe11a766eb..34bc2f6ca3d 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) diff --git a/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.expect b/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.expect index c0939071976..0f3b1f76e7e 100644 --- a/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.expect +++ b/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.expect @@ -173,7 +173,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, augment, Class) + beginClassDeclaration(class, null, null, null, null, augment, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -188,7 +188,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, augment, Class) + beginClassDeclaration(abstract, abstract, null, null, null, augment, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -203,7 +203,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, augment, Class) + beginNamedMixinApplication(class, null, null, null, null, augment, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -220,7 +220,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(abstract, abstract, null, null, null, augment, Class) + beginNamedMixinApplication(abstract, abstract, 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_declarations.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.intertwined.expect index 27cc44c594c..9e33d815b36 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 @@ -325,12 +325,12 @@ parseUnit(augment) listener: beginMetadataStar(augment) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, augment, class) + parseClassOrNamedMixinApplication(null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, augment, Class) + listener: beginClassDeclaration(class, null, null, null, null, augment, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -352,12 +352,12 @@ parseUnit(augment) listener: beginMetadataStar(augment) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, augment, class) + parseClassOrNamedMixinApplication(abstract, 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, augment, Class) + listener: beginClassDeclaration(abstract, abstract, null, null, null, augment, null, Class) parseClass(Class, abstract, class, Class) parseClassHeaderOpt(Class, abstract, class) parseClassExtendsOpt(Class) @@ -379,12 +379,12 @@ parseUnit(augment) listener: beginMetadataStar(augment) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, augment, class) + parseClassOrNamedMixinApplication(null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, augment, Class) + listener: beginNamedMixinApplication(class, null, null, null, null, augment, null, Class) parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) @@ -405,12 +405,12 @@ parseUnit(augment) listener: beginMetadataStar(augment) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, augment, class) + parseClassOrNamedMixinApplication(abstract, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(abstract, abstract, null, null, null, augment, Class) + listener: beginNamedMixinApplication(abstract, abstract, null, null, null, augment, null, Class) parseNamedMixinApplication(Class, abstract, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) 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 8bd73fb7b4b..d6b7c98c7d9 100644 --- a/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.expect +++ b/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.expect @@ -491,7 +491,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, augment, Class) + beginClassDeclaration(class, null, null, null, null, augment, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -507,7 +507,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, augment, Class) + beginClassDeclaration(abstract, abstract, null, null, null, augment, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -523,7 +523,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, augment, Class) + beginNamedMixinApplication(class, null, null, null, null, augment, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -541,7 +541,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(abstract, abstract, null, null, null, augment, Class) + beginNamedMixinApplication(abstract, abstract, 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 706b353fe7a..94cf6f10f9d 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 @@ -693,12 +693,12 @@ parseUnit(augment) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment) - parseClassOrNamedMixinApplication(null, null, null, null, augment, class) + parseClassOrNamedMixinApplication(null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, augment, Class) + listener: beginClassDeclaration(class, null, null, null, null, augment, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -722,12 +722,12 @@ parseUnit(augment) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') reportRecoverableError(augment, Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {string: augment, string2: abstract}]) listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {string: augment, string2: abstract}], augment, augment) - parseClassOrNamedMixinApplication(abstract, null, null, null, augment, class) + parseClassOrNamedMixinApplication(abstract, 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, augment, Class) + listener: beginClassDeclaration(abstract, abstract, null, null, null, augment, null, Class) parseClass(Class, abstract, class, Class) parseClassHeaderOpt(Class, abstract, class) parseClassExtendsOpt(Class) @@ -751,12 +751,12 @@ parseUnit(augment) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment) - parseClassOrNamedMixinApplication(null, null, null, null, augment, class) + parseClassOrNamedMixinApplication(null, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, augment, Class) + listener: beginNamedMixinApplication(class, null, null, null, null, augment, null, Class) parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) @@ -779,12 +779,12 @@ parseUnit(augment) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') reportRecoverableError(augment, Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {string: augment, string2: abstract}]) listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {string: augment, string2: abstract}], augment, augment) - parseClassOrNamedMixinApplication(abstract, null, null, null, augment, class) + parseClassOrNamedMixinApplication(abstract, null, null, null, augment, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(abstract, abstract, null, null, null, augment, Class) + listener: beginNamedMixinApplication(abstract, abstract, null, null, null, augment, null, Class) parseNamedMixinApplication(Class, abstract, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) 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 a58428b8fd5..cf6e8ce88bd 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -114,7 +114,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, null, D) handleNoType(D) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.intertwined.expect index 26ea586260f..8b8346095b2 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -258,12 +258,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, D) + listener: beginClassDeclaration(class, null, null, null, null, null, null, D) parseClass(D, class, class, D) parseClassHeaderOpt(D, class, class) parseClassExtendsOpt(D) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect index b98b58d14a0..2be02b516f7 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect index a317d0917ee..f113a1bb872 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect index 617b8637472..7ba1e407c97 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect index 348c43e5939..e7be0f17493 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect index de5fe6fa55c..aac023d4687 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect index 4dba3144b48..5331a9d6626 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect index 8a95673ae56..e9bf7e4d21f 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect index 439b272805c..0457851e4c3 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect index 7527c1cc88a..5b108677213 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect index dd99a659a51..da8439a511b 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect index 053abd52539..d0f017e7877 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect index 532d94dd8c4..fdff2ea65e0 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect index e4987dce7b4..b909d16b1d7 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect index 8968204f366..5593a9ce7ac 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect index 921fb9677b6..84b884fc334 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect index bd620398113..ac7484edfbb 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect index 753ad7a46eb..b4826e22a67 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect index 347fc2458d1..f8693fcec49 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.expect index 02e9752b374..b748818b377 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.intertwined.expect index 6fcb355c26c..39ef985d11f 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect index 0f2372677b0..b49fc3dff8e 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -41,7 +41,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() @@ -56,7 +56,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleIdentifier(A, typeReference) handleNoTypeArguments(,) handleType(A, null) @@ -92,7 +92,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables(extend) - beginClassDeclaration(class, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() @@ -134,7 +134,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Baz, classOrMixinDeclaration) handleNoTypeVariables(on) - beginClassDeclaration(class, null, null, null, null, null, Baz) + beginClassDeclaration(class, null, null, null, null, null, null, Baz) handleNoType(Baz) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect index a960c666c2d..83955fece6c 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -34,12 +34,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -61,12 +61,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) @@ -128,12 +128,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, Bar) parseClassHeaderOpt(Bar, class, class) parseClassExtendsOpt(Bar) @@ -211,12 +211,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Baz) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Baz) parseClass(Baz, class, class, Baz) parseClassHeaderOpt(Baz, class, class) parseClassExtendsOpt(Baz) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect index 9d729a6685c..cdbd245b4d8 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, Annotation) + beginClassDeclaration(class, null, null, null, null, null, null, Annotation) handleNoType(Annotation) handleClassExtends(null, 1) handleClassNoWithClause() @@ -80,7 +80,7 @@ beginCompilationUnit(const) handleNoType(E) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() @@ -95,7 +95,7 @@ beginCompilationUnit(const) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect index 47f52f26d22..4ebc101c8dd 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 @@ -29,12 +29,12 @@ parseUnit(const) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Annotation) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Annotation) parseClass(Annotation, class, class, Annotation) parseClassHeaderOpt(Annotation, class, class) parseClassExtendsOpt(Annotation) @@ -112,7 +112,7 @@ parseUnit(const) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) @@ -125,7 +125,7 @@ parseUnit(const) listener: handleNoType(E) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(>, class, class, A) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) @@ -147,12 +147,12 @@ parseUnit(const) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect index 45b63a2f5a4..b96e53757ed 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, Key) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, Key) handleNoType(Key) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect index a24736365fa..43cb1613e12 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 @@ -7,12 +7,12 @@ parseUnit(abstract) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) + parseClassOrNamedMixinApplication(abstract, 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, Key) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, Key) parseClass(Key, abstract, class, Key) parseClassHeaderOpt(Key, abstract, class) parseClassExtendsOpt(Key) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect index 3b86483f5b0..50a23369118 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, Key) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, Key) handleNoType(Key) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect index f274a554661..9e95c20e3db 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 @@ -7,12 +7,12 @@ parseUnit(abstract) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) + parseClassOrNamedMixinApplication(abstract, 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, Key) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, Key) parseClass(Key, abstract, class, Key) parseClassHeaderOpt(Key, abstract, class) parseClassExtendsOpt(Key) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect index f1cb10782a6..ee548fc90ed 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, Key) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, Key) handleNoType(Key) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect index d59bb5e9fd6..533fba7f1a8 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 @@ -7,12 +7,12 @@ parseUnit(abstract) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) + parseClassOrNamedMixinApplication(abstract, 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, Key) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, Key) parseClass(Key, abstract, class, Key) parseClassHeaderOpt(Key, abstract, class) parseClassExtendsOpt(Key) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect index f0b0191e004..ca71c4ea476 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect index 5eb0f082b96..69e810399f3 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect index 0b2640f5ff7..e8fa5ccb066 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect index 1e31dcb69eb..74ebac4440d 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect index 028c087ce7a..c00fde06205 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect index 5e48edfdd25..314e8b4a121 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.expect index 507ca48a8fe..0ca772024db 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() @@ -54,7 +54,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(DND1, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, DND1) + beginClassDeclaration(class, null, null, null, null, null, null, DND1) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.intertwined.expect index 01b85be4be7..50afa8b2ae1 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 @@ -7,7 +7,7 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(>, class, class, A) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) @@ -73,12 +73,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, DND1) + listener: beginClassDeclaration(class, null, null, null, null, null, null, DND1) parseClass(DND1, class, class, DND1) parseClassHeaderOpt(DND1, class, class) parseClassExtendsOpt(DND1) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.expect index 9ae8745ef90..018deceefb8 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, F) + beginClassDeclaration(class, null, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.intertwined.expect index f039b0d8b08..dfb250ee58a 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.expect index d559b43d942..7798aebfbf2 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, F) + beginClassDeclaration(class, null, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.intertwined.expect index cb6f8150620..8c8eb83a4dc 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.expect index dee3b2f7713..3e7b3e93ffd 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, F) + beginClassDeclaration(class, null, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.intertwined.expect index c2dee11ed63..9c5d85882ae 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.expect index 66e8a3914c5..cf0fbf08638 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, F) + beginClassDeclaration(class, null, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.intertwined.expect index 3383dc04f45..644215de23b 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.expect index caf07de200d..c2dd825b297 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, F) + beginClassDeclaration(class, null, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.intertwined.expect index 528dfcd4110..f354e562d98 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.expect index 7c2d5ea8b9e..17f705c6140 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, F) + beginClassDeclaration(class, null, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.intertwined.expect index 865bf255ee7..993fda31716 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.expect index 9df94f51d0e..8cce76095e4 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, F) + beginClassDeclaration(class, null, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.intertwined.expect index ae30bddb678..17b4893b64c 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.expect index c3f9652fbf6..afdbd605422 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, F) + beginClassDeclaration(class, null, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.intertwined.expect index 75707e76bc0..63943026949 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.expect index 1df236c11cb..930b7dc6a0b 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, F) + beginClassDeclaration(class, null, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.intertwined.expect index 6a5014957f8..cd5029b34a4 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, F) + listener: beginClassDeclaration(class, null, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect index 7cade0b3775..97c66669ecd 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect index b842e8fb30d..48d5a53263b 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 @@ -7,7 +7,7 @@ parseUnit(UnmatchedToken(()) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(UnmatchedToken((), class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(>, class, class, Foo) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.expect index f10ecca4507..f6f52183995 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.expect @@ -231,7 +231,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'abstract' as a name here., null, {lexeme: abstract}], abstract, abstract) handleIdentifier(abstract, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, abstract) + beginClassDeclaration(class, null, null, null, null, null, null, abstract) handleNoType(abstract) handleClassExtends(null, 1) handleClassNoWithClause() @@ -247,7 +247,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'as' as a name here., null, {lexeme: as}], as, as) handleIdentifier(as, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, as) + beginClassDeclaration(class, null, null, null, null, null, null, as) handleNoType(as) handleClassExtends(null, 1) handleClassNoWithClause() @@ -263,7 +263,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'assert' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: assert}], assert, assert) handleIdentifier(assert, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, assert) + beginClassDeclaration(class, null, null, null, null, null, null, assert) handleNoType(assert) handleClassExtends(null, 1) handleClassNoWithClause() @@ -278,7 +278,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(async, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, async) + beginClassDeclaration(class, null, null, null, null, null, null, async) handleNoType(async) handleClassExtends(null, 1) handleClassNoWithClause() @@ -293,7 +293,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(await, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, await) + beginClassDeclaration(class, null, null, null, null, null, null, await) handleNoType(await) handleClassExtends(null, 1) handleClassNoWithClause() @@ -309,7 +309,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'break' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: break}], break, break) handleIdentifier(break, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, break) + beginClassDeclaration(class, null, null, null, null, null, null, break) handleNoType(break) handleClassExtends(null, 1) handleClassNoWithClause() @@ -325,7 +325,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'case' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: case}], case, case) handleIdentifier(case, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, case) + beginClassDeclaration(class, null, null, null, null, null, null, case) handleNoType(case) handleClassExtends(null, 1) handleClassNoWithClause() @@ -341,7 +341,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'catch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: catch}], catch, catch) handleIdentifier(catch, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, catch) + beginClassDeclaration(class, null, null, null, null, null, null, catch) handleNoType(catch) handleClassExtends(null, 1) handleClassNoWithClause() @@ -357,7 +357,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'class' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: class}], class, class) handleIdentifier(class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, class) + beginClassDeclaration(class, null, null, null, null, null, null, class) handleNoType(class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -373,7 +373,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'const' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: const}], const, const) handleIdentifier(const, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, const) + beginClassDeclaration(class, null, null, null, null, null, null, const) handleNoType(const) handleClassExtends(null, 1) handleClassNoWithClause() @@ -389,7 +389,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'continue' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: continue}], continue, continue) handleIdentifier(continue, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, continue) + beginClassDeclaration(class, null, null, null, null, null, null, continue) handleNoType(continue) handleClassExtends(null, 1) handleClassNoWithClause() @@ -405,7 +405,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'covariant' as a name here., null, {lexeme: covariant}], covariant, covariant) handleIdentifier(covariant, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, covariant) + beginClassDeclaration(class, null, null, null, null, null, null, covariant) handleNoType(covariant) handleClassExtends(null, 1) handleClassNoWithClause() @@ -421,7 +421,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'default' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: default}], default, default) handleIdentifier(default, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, default) + beginClassDeclaration(class, null, null, null, null, null, null, default) handleNoType(default) handleClassExtends(null, 1) handleClassNoWithClause() @@ -437,7 +437,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'deferred' as a name here., null, {lexeme: deferred}], deferred, deferred) handleIdentifier(deferred, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, deferred) + beginClassDeclaration(class, null, null, null, null, null, null, deferred) handleNoType(deferred) handleClassExtends(null, 1) handleClassNoWithClause() @@ -453,7 +453,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'do' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: do}], do, do) handleIdentifier(do, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, do) + beginClassDeclaration(class, null, null, null, null, null, null, do) handleNoType(do) handleClassExtends(null, 1) handleClassNoWithClause() @@ -469,7 +469,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'dynamic' as a name here., null, {lexeme: dynamic}], dynamic, dynamic) handleIdentifier(dynamic, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, dynamic) + beginClassDeclaration(class, null, null, null, null, null, null, dynamic) handleNoType(dynamic) handleClassExtends(null, 1) handleClassNoWithClause() @@ -485,7 +485,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'else' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: else}], else, else) handleIdentifier(else, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, else) + beginClassDeclaration(class, null, null, null, null, null, null, else) handleNoType(else) handleClassExtends(null, 1) handleClassNoWithClause() @@ -501,7 +501,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: enum}], enum, enum) handleIdentifier(enum, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, enum) + beginClassDeclaration(class, null, null, null, null, null, null, enum) handleNoType(enum) handleClassExtends(null, 1) handleClassNoWithClause() @@ -517,7 +517,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'export' as a name here., null, {lexeme: export}], export, export) handleIdentifier(export, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, export) + beginClassDeclaration(class, null, null, null, null, null, null, export) handleNoType(export) handleClassExtends(null, 1) handleClassNoWithClause() @@ -533,7 +533,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'extends' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: extends}], extends, extends) handleIdentifier(extends, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, extends) + beginClassDeclaration(class, null, null, null, null, null, null, extends) handleNoType(extends) handleClassExtends(null, 1) handleClassNoWithClause() @@ -549,7 +549,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'extension' as a name here., null, {lexeme: extension}], extension, extension) handleIdentifier(extension, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, extension) + beginClassDeclaration(class, null, null, null, null, null, null, extension) handleNoType(extension) handleClassExtends(null, 1) handleClassNoWithClause() @@ -565,7 +565,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'external' as a name here., null, {lexeme: external}], external, external) handleIdentifier(external, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, external) + beginClassDeclaration(class, null, null, null, null, null, null, external) handleNoType(external) handleClassExtends(null, 1) handleClassNoWithClause() @@ -581,7 +581,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'factory' as a name here., null, {lexeme: factory}], factory, factory) handleIdentifier(factory, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, factory) + beginClassDeclaration(class, null, null, null, null, null, null, factory) handleNoType(factory) handleClassExtends(null, 1) handleClassNoWithClause() @@ -597,7 +597,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'false' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: false}], false, false) handleIdentifier(false, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, false) + beginClassDeclaration(class, null, null, null, null, null, null, false) handleNoType(false) handleClassExtends(null, 1) handleClassNoWithClause() @@ -613,7 +613,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'final' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: final}], final, final) handleIdentifier(final, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, final) + beginClassDeclaration(class, null, null, null, null, null, null, final) handleNoType(final) handleClassExtends(null, 1) handleClassNoWithClause() @@ -629,7 +629,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'finally' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: finally}], finally, finally) handleIdentifier(finally, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, finally) + beginClassDeclaration(class, null, null, null, null, null, null, finally) handleNoType(finally) handleClassExtends(null, 1) handleClassNoWithClause() @@ -645,7 +645,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'for' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: for}], for, for) handleIdentifier(for, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, for) + beginClassDeclaration(class, null, null, null, null, null, null, for) handleNoType(for) handleClassExtends(null, 1) handleClassNoWithClause() @@ -661,7 +661,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) handleIdentifier(Function, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Function) + beginClassDeclaration(class, null, null, null, null, null, null, Function) handleNoType(Function) handleClassExtends(null, 1) handleClassNoWithClause() @@ -677,7 +677,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'get' as a name here., null, {lexeme: get}], get, get) handleIdentifier(get, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, get) + beginClassDeclaration(class, null, null, null, null, null, null, get) handleNoType(get) handleClassExtends(null, 1) handleClassNoWithClause() @@ -692,7 +692,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(hide, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, hide) + beginClassDeclaration(class, null, null, null, null, null, null, hide) handleNoType(hide) handleClassExtends(null, 1) handleClassNoWithClause() @@ -708,7 +708,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'if' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: if}], if, if) handleIdentifier(if, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, if) + beginClassDeclaration(class, null, null, null, null, null, null, if) handleNoType(if) handleClassExtends(null, 1) handleClassNoWithClause() @@ -724,7 +724,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'implements' as a name here., null, {lexeme: implements}], implements, implements) handleIdentifier(implements, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, implements) + beginClassDeclaration(class, null, null, null, null, null, null, implements) handleNoType(implements) handleClassExtends(null, 1) handleClassNoWithClause() @@ -740,7 +740,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'import' as a name here., null, {lexeme: import}], import, import) handleIdentifier(import, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, import) + beginClassDeclaration(class, null, null, null, null, null, null, import) handleNoType(import) handleClassExtends(null, 1) handleClassNoWithClause() @@ -756,7 +756,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'in' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: in}], in, in) handleIdentifier(in, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, in) + beginClassDeclaration(class, null, null, null, null, null, null, in) handleNoType(in) handleClassExtends(null, 1) handleClassNoWithClause() @@ -771,7 +771,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(inout, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, inout) + beginClassDeclaration(class, null, null, null, null, null, null, inout) handleNoType(inout) handleClassExtends(null, 1) handleClassNoWithClause() @@ -787,7 +787,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'interface' as a name here., null, {lexeme: interface}], interface, interface) handleIdentifier(interface, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, interface) + beginClassDeclaration(class, null, null, null, null, null, null, interface) handleNoType(interface) handleClassExtends(null, 1) handleClassNoWithClause() @@ -803,7 +803,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'is' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: is}], is, is) handleIdentifier(is, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, is) + beginClassDeclaration(class, null, null, null, null, null, null, is) handleNoType(is) handleClassExtends(null, 1) handleClassNoWithClause() @@ -819,7 +819,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'late' as a name here., null, {lexeme: late}], late, late) handleIdentifier(late, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, late) + beginClassDeclaration(class, null, null, null, null, null, null, late) handleNoType(late) handleClassExtends(null, 1) handleClassNoWithClause() @@ -835,7 +835,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'library' as a name here., null, {lexeme: library}], library, library) handleIdentifier(library, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, library) + beginClassDeclaration(class, null, null, null, null, null, null, library) handleNoType(library) handleClassExtends(null, 1) handleClassNoWithClause() @@ -851,7 +851,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'mixin' as a name here., null, {lexeme: mixin}], mixin, mixin) handleIdentifier(mixin, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, mixin) + beginClassDeclaration(class, null, null, null, null, null, null, mixin) handleNoType(mixin) handleClassExtends(null, 1) handleClassNoWithClause() @@ -866,7 +866,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(native, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, native) + beginClassDeclaration(class, null, null, null, null, null, null, native) handleNoType(native) handleClassExtends(null, 1) handleClassNoWithClause() @@ -882,7 +882,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'new' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: new}], new, new) handleIdentifier(new, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, new) + beginClassDeclaration(class, null, null, null, null, null, null, new) handleNoType(new) handleClassExtends(null, 1) handleClassNoWithClause() @@ -898,7 +898,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'null' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: null}], null, null) handleIdentifier(null, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, null) + beginClassDeclaration(class, null, null, null, null, null, null, null) handleNoType(null) handleClassExtends(null, 1) handleClassNoWithClause() @@ -913,7 +913,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(of, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, of) + beginClassDeclaration(class, null, null, null, null, null, null, of) handleNoType(of) handleClassExtends(null, 1) handleClassNoWithClause() @@ -928,7 +928,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(on, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, on) + beginClassDeclaration(class, null, null, null, null, null, null, on) handleNoType(on) handleClassExtends(null, 1) handleClassNoWithClause() @@ -944,7 +944,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) handleIdentifier(operator, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, operator) + beginClassDeclaration(class, null, null, null, null, null, null, operator) handleNoType(operator) handleClassExtends(null, 1) handleClassNoWithClause() @@ -959,7 +959,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(out, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, out) + beginClassDeclaration(class, null, null, null, null, null, null, out) handleNoType(out) handleClassExtends(null, 1) handleClassNoWithClause() @@ -975,7 +975,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'part' as a name here., null, {lexeme: part}], part, part) handleIdentifier(part, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, part) + beginClassDeclaration(class, null, null, null, null, null, null, part) handleNoType(part) handleClassExtends(null, 1) handleClassNoWithClause() @@ -990,7 +990,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(patch, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, patch) + beginClassDeclaration(class, null, null, null, null, null, null, patch) handleNoType(patch) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1006,7 +1006,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'required' as a name here., null, {lexeme: required}], required, required) handleIdentifier(required, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, required) + beginClassDeclaration(class, null, null, null, null, null, null, required) handleNoType(required) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1022,7 +1022,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'rethrow' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: rethrow}], rethrow, rethrow) handleIdentifier(rethrow, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, rethrow) + beginClassDeclaration(class, null, null, null, null, null, null, rethrow) handleNoType(rethrow) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1038,7 +1038,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'return' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: return}], return, return) handleIdentifier(return, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, return) + beginClassDeclaration(class, null, null, null, null, null, null, return) handleNoType(return) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1054,7 +1054,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'set' as a name here., null, {lexeme: set}], set, set) handleIdentifier(set, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, set) + beginClassDeclaration(class, null, null, null, null, null, null, set) handleNoType(set) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1069,7 +1069,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(show, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, show) + beginClassDeclaration(class, null, null, null, null, null, null, show) handleNoType(show) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1084,7 +1084,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(source, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, source) + beginClassDeclaration(class, null, null, null, null, null, null, source) handleNoType(source) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1100,7 +1100,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'static' as a name here., null, {lexeme: static}], static, static) handleIdentifier(static, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, static) + beginClassDeclaration(class, null, null, null, null, null, null, static) handleNoType(static) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1116,7 +1116,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'super' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: super}], super, super) handleIdentifier(super, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, super) + beginClassDeclaration(class, null, null, null, null, null, null, super) handleNoType(super) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1132,7 +1132,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'switch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: switch}], switch, switch) handleIdentifier(switch, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, switch) + beginClassDeclaration(class, null, null, null, null, null, null, switch) handleNoType(switch) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1147,7 +1147,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(sync, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, sync) + beginClassDeclaration(class, null, null, null, null, null, null, sync) handleNoType(sync) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1163,7 +1163,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) handleIdentifier(this, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, this) + beginClassDeclaration(class, null, null, null, null, null, null, this) handleNoType(this) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1179,7 +1179,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'throw' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: throw}], throw, throw) handleIdentifier(throw, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, throw) + beginClassDeclaration(class, null, null, null, null, null, null, throw) handleNoType(throw) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1195,7 +1195,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'true' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: true}], true, true) handleIdentifier(true, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, true) + beginClassDeclaration(class, null, null, null, null, null, null, true) handleNoType(true) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1211,7 +1211,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'try' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: try}], try, try) handleIdentifier(try, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, try) + beginClassDeclaration(class, null, null, null, null, null, null, try) handleNoType(try) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1227,7 +1227,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'typedef' as a name here., null, {lexeme: typedef}], typedef, typedef) handleIdentifier(typedef, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, typedef) + beginClassDeclaration(class, null, null, null, null, null, null, typedef) handleNoType(typedef) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1243,7 +1243,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'var' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: var}], var, var) handleIdentifier(var, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, var) + beginClassDeclaration(class, null, null, null, null, null, null, var) handleNoType(var) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1259,7 +1259,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'void' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: void}], void, void) handleIdentifier(void, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, void) + beginClassDeclaration(class, null, null, null, null, null, null, void) handleNoType(void) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1275,7 +1275,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'while' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: while}], while, while) handleIdentifier(while, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, while) + beginClassDeclaration(class, null, null, null, null, null, null, while) handleNoType(while) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1291,7 +1291,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with) handleIdentifier(with, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, with) + beginClassDeclaration(class, null, null, null, null, null, null, with) handleNoType(with) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1306,7 +1306,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(yield, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, yield) + beginClassDeclaration(class, null, null, null, null, null, null, yield) handleNoType(yield) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.intertwined.expect index 4f7be02588e..3d9694a8847 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 @@ -7,14 +7,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(abstract, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'abstract' as a name here., null, {lexeme: abstract}], abstract, abstract) listener: handleIdentifier(abstract, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, abstract) + listener: beginClassDeclaration(class, null, null, null, null, null, null, abstract) parseClass(abstract, class, class, abstract) parseClassHeaderOpt(abstract, class, class) parseClassExtendsOpt(abstract) @@ -36,14 +36,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(as, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'as' as a name here., null, {lexeme: as}], as, as) listener: handleIdentifier(as, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, as) + listener: beginClassDeclaration(class, null, null, null, null, null, null, as) parseClass(as, class, class, as) parseClassHeaderOpt(as, class, class) parseClassExtendsOpt(as) @@ -65,14 +65,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(assert, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'assert' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: assert}], assert, assert) listener: handleIdentifier(assert, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, assert) + listener: beginClassDeclaration(class, null, null, null, null, null, null, assert) parseClass(assert, class, class, assert) parseClassHeaderOpt(assert, class, class) parseClassExtendsOpt(assert) @@ -94,12 +94,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, async) + listener: beginClassDeclaration(class, null, null, null, null, null, null, async) parseClass(async, class, class, async) parseClassHeaderOpt(async, class, class) parseClassExtendsOpt(async) @@ -121,12 +121,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, await) + listener: beginClassDeclaration(class, null, null, null, null, null, null, await) parseClass(await, class, class, await) parseClassHeaderOpt(await, class, class) parseClassExtendsOpt(await) @@ -148,14 +148,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(break, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'break' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: break}], break, break) listener: handleIdentifier(break, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, break) + listener: beginClassDeclaration(class, null, null, null, null, null, null, break) parseClass(break, class, class, break) parseClassHeaderOpt(break, class, class) parseClassExtendsOpt(break) @@ -177,14 +177,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(case, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'case' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: case}], case, case) listener: handleIdentifier(case, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, case) + listener: beginClassDeclaration(class, null, null, null, null, null, null, case) parseClass(case, class, class, case) parseClassHeaderOpt(case, class, class) parseClassExtendsOpt(case) @@ -206,14 +206,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(catch, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'catch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: catch}], catch, catch) listener: handleIdentifier(catch, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, catch) + listener: beginClassDeclaration(class, null, null, null, null, null, null, catch) parseClass(catch, class, class, catch) parseClassHeaderOpt(catch, class, class) parseClassExtendsOpt(catch) @@ -235,14 +235,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(class, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'class' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: class}], class, class) listener: handleIdentifier(class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, class) parseClass(class, class, class, class) parseClassHeaderOpt(class, class, class) parseClassExtendsOpt(class) @@ -264,14 +264,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(const, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'const' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: const}], const, const) listener: handleIdentifier(const, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, const) + listener: beginClassDeclaration(class, null, null, null, null, null, null, const) parseClass(const, class, class, const) parseClassHeaderOpt(const, class, class) parseClassExtendsOpt(const) @@ -293,14 +293,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(continue, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'continue' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: continue}], continue, continue) listener: handleIdentifier(continue, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, continue) + listener: beginClassDeclaration(class, null, null, null, null, null, null, continue) parseClass(continue, class, class, continue) parseClassHeaderOpt(continue, class, class) parseClassExtendsOpt(continue) @@ -322,14 +322,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(covariant, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'covariant' as a name here., null, {lexeme: covariant}], covariant, covariant) listener: handleIdentifier(covariant, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, covariant) + listener: beginClassDeclaration(class, null, null, null, null, null, null, covariant) parseClass(covariant, class, class, covariant) parseClassHeaderOpt(covariant, class, class) parseClassExtendsOpt(covariant) @@ -351,14 +351,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(default, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'default' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: default}], default, default) listener: handleIdentifier(default, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, default) + listener: beginClassDeclaration(class, null, null, null, null, null, null, default) parseClass(default, class, class, default) parseClassHeaderOpt(default, class, class) parseClassExtendsOpt(default) @@ -380,14 +380,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(deferred, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'deferred' as a name here., null, {lexeme: deferred}], deferred, deferred) listener: handleIdentifier(deferred, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, deferred) + listener: beginClassDeclaration(class, null, null, null, null, null, null, deferred) parseClass(deferred, class, class, deferred) parseClassHeaderOpt(deferred, class, class) parseClassExtendsOpt(deferred) @@ -409,14 +409,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(do, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'do' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: do}], do, do) listener: handleIdentifier(do, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, do) + listener: beginClassDeclaration(class, null, null, null, null, null, null, do) parseClass(do, class, class, do) parseClassHeaderOpt(do, class, class) parseClassExtendsOpt(do) @@ -438,14 +438,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(dynamic, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'dynamic' as a name here., null, {lexeme: dynamic}], dynamic, dynamic) listener: handleIdentifier(dynamic, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, dynamic) + listener: beginClassDeclaration(class, null, null, null, null, null, null, dynamic) parseClass(dynamic, class, class, dynamic) parseClassHeaderOpt(dynamic, class, class) parseClassExtendsOpt(dynamic) @@ -467,14 +467,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(else, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'else' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: else}], else, else) listener: handleIdentifier(else, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, else) + listener: beginClassDeclaration(class, null, null, null, null, null, null, else) parseClass(else, class, class, else) parseClassHeaderOpt(else, class, class) parseClassExtendsOpt(else) @@ -496,14 +496,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(enum, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: enum}], enum, enum) listener: handleIdentifier(enum, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, enum) + listener: beginClassDeclaration(class, null, null, null, null, null, null, enum) parseClass(enum, class, class, enum) parseClassHeaderOpt(enum, class, class) parseClassExtendsOpt(enum) @@ -525,14 +525,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(export, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'export' as a name here., null, {lexeme: export}], export, export) listener: handleIdentifier(export, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, export) + listener: beginClassDeclaration(class, null, null, null, null, null, null, export) parseClass(export, class, class, export) parseClassHeaderOpt(export, class, class) parseClassExtendsOpt(export) @@ -554,14 +554,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extends, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'extends' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: extends}], extends, extends) listener: handleIdentifier(extends, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, extends) + listener: beginClassDeclaration(class, null, null, null, null, null, null, extends) parseClass(extends, class, class, extends) parseClassHeaderOpt(extends, class, class) parseClassExtendsOpt(extends) @@ -583,14 +583,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extension, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'extension' as a name here., null, {lexeme: extension}], extension, extension) listener: handleIdentifier(extension, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, extension) + listener: beginClassDeclaration(class, null, null, null, null, null, null, extension) parseClass(extension, class, class, extension) parseClassHeaderOpt(extension, class, class) parseClassExtendsOpt(extension) @@ -612,14 +612,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(external, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'external' as a name here., null, {lexeme: external}], external, external) listener: handleIdentifier(external, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, external) + listener: beginClassDeclaration(class, null, null, null, null, null, null, external) parseClass(external, class, class, external) parseClassHeaderOpt(external, class, class) parseClassExtendsOpt(external) @@ -641,14 +641,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(factory, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'factory' as a name here., null, {lexeme: factory}], factory, factory) listener: handleIdentifier(factory, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, factory) + listener: beginClassDeclaration(class, null, null, null, null, null, null, factory) parseClass(factory, class, class, factory) parseClassHeaderOpt(factory, class, class) parseClassExtendsOpt(factory) @@ -670,14 +670,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(false, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'false' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: false}], false, false) listener: handleIdentifier(false, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, false) + listener: beginClassDeclaration(class, null, null, null, null, null, null, false) parseClass(false, class, class, false) parseClassHeaderOpt(false, class, class) parseClassExtendsOpt(false) @@ -699,14 +699,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(final, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'final' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: final}], final, final) listener: handleIdentifier(final, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, final) + listener: beginClassDeclaration(class, null, null, null, null, null, null, final) parseClass(final, class, class, final) parseClassHeaderOpt(final, class, class) parseClassExtendsOpt(final) @@ -728,14 +728,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(finally, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'finally' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: finally}], finally, finally) listener: handleIdentifier(finally, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, finally) + listener: beginClassDeclaration(class, null, null, null, null, null, null, finally) parseClass(finally, class, class, finally) parseClassHeaderOpt(finally, class, class) parseClassExtendsOpt(finally) @@ -757,14 +757,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(for, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'for' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: for}], for, for) listener: handleIdentifier(for, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, for) + listener: beginClassDeclaration(class, null, null, null, null, null, null, for) parseClass(for, class, class, for) parseClassHeaderOpt(for, class, class) parseClassExtendsOpt(for) @@ -786,14 +786,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(Function, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) listener: handleIdentifier(Function, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, Function) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Function) parseClass(Function, class, class, Function) parseClassHeaderOpt(Function, class, class) parseClassExtendsOpt(Function) @@ -815,14 +815,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(get, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'get' as a name here., null, {lexeme: get}], get, get) listener: handleIdentifier(get, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, get) + listener: beginClassDeclaration(class, null, null, null, null, null, null, get) parseClass(get, class, class, get) parseClassHeaderOpt(get, class, class) parseClassExtendsOpt(get) @@ -844,12 +844,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, hide) + listener: beginClassDeclaration(class, null, null, null, null, null, null, hide) parseClass(hide, class, class, hide) parseClassHeaderOpt(hide, class, class) parseClassExtendsOpt(hide) @@ -871,14 +871,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(if, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'if' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: if}], if, if) listener: handleIdentifier(if, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, if) + listener: beginClassDeclaration(class, null, null, null, null, null, null, if) parseClass(if, class, class, if) parseClassHeaderOpt(if, class, class) parseClassExtendsOpt(if) @@ -900,14 +900,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(implements, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'implements' as a name here., null, {lexeme: implements}], implements, implements) listener: handleIdentifier(implements, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, implements) + listener: beginClassDeclaration(class, null, null, null, null, null, null, implements) parseClass(implements, class, class, implements) parseClassHeaderOpt(implements, class, class) parseClassExtendsOpt(implements) @@ -929,14 +929,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(import, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'import' as a name here., null, {lexeme: import}], import, import) listener: handleIdentifier(import, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, import) + listener: beginClassDeclaration(class, null, null, null, null, null, null, import) parseClass(import, class, class, import) parseClassHeaderOpt(import, class, class) parseClassExtendsOpt(import) @@ -958,14 +958,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(in, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'in' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: in}], in, in) listener: handleIdentifier(in, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, in) + listener: beginClassDeclaration(class, null, null, null, null, null, null, in) parseClass(in, class, class, in) parseClassHeaderOpt(in, class, class) parseClassExtendsOpt(in) @@ -987,12 +987,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, inout) + listener: beginClassDeclaration(class, null, null, null, null, null, null, inout) parseClass(inout, class, class, inout) parseClassHeaderOpt(inout, class, class) parseClassExtendsOpt(inout) @@ -1014,14 +1014,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(interface, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'interface' as a name here., null, {lexeme: interface}], interface, interface) listener: handleIdentifier(interface, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, interface) + listener: beginClassDeclaration(class, null, null, null, null, null, null, interface) parseClass(interface, class, class, interface) parseClassHeaderOpt(interface, class, class) parseClassExtendsOpt(interface) @@ -1043,14 +1043,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(is, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'is' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: is}], is, is) listener: handleIdentifier(is, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, is) + listener: beginClassDeclaration(class, null, null, null, null, null, null, is) parseClass(is, class, class, is) parseClassHeaderOpt(is, class, class) parseClassExtendsOpt(is) @@ -1072,14 +1072,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(late, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'late' as a name here., null, {lexeme: late}], late, late) listener: handleIdentifier(late, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, late) + listener: beginClassDeclaration(class, null, null, null, null, null, null, late) parseClass(late, class, class, late) parseClassHeaderOpt(late, class, class) parseClassExtendsOpt(late) @@ -1101,14 +1101,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(library, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'library' as a name here., null, {lexeme: library}], library, library) listener: handleIdentifier(library, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, library) + listener: beginClassDeclaration(class, null, null, null, null, null, null, library) parseClass(library, class, class, library) parseClassHeaderOpt(library, class, class) parseClassExtendsOpt(library) @@ -1130,14 +1130,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(mixin, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'mixin' as a name here., null, {lexeme: mixin}], mixin, mixin) listener: handleIdentifier(mixin, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, mixin) + listener: beginClassDeclaration(class, null, null, null, null, null, null, mixin) parseClass(mixin, class, class, mixin) parseClassHeaderOpt(mixin, class, class) parseClassExtendsOpt(mixin) @@ -1159,12 +1159,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, native) + listener: beginClassDeclaration(class, null, null, null, null, null, null, native) parseClass(native, class, class, native) parseClassHeaderOpt(native, class, class) parseClassExtendsOpt(native) @@ -1186,14 +1186,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(new, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'new' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: new}], new, new) listener: handleIdentifier(new, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, new) + listener: beginClassDeclaration(class, null, null, null, null, null, null, new) parseClass(new, class, class, new) parseClassHeaderOpt(new, class, class) parseClassExtendsOpt(new) @@ -1215,14 +1215,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(null, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'null' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: null}], null, null) listener: handleIdentifier(null, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, null) + listener: beginClassDeclaration(class, null, null, null, null, null, null, null) parseClass(null, class, class, null) parseClassHeaderOpt(null, class, class) parseClassExtendsOpt(null) @@ -1244,12 +1244,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, of) + listener: beginClassDeclaration(class, null, null, null, null, null, null, of) parseClass(of, class, class, of) parseClassHeaderOpt(of, class, class) parseClassExtendsOpt(of) @@ -1271,12 +1271,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, on) + listener: beginClassDeclaration(class, null, null, null, null, null, null, on) parseClass(on, class, class, on) parseClassHeaderOpt(on, class, class) parseClassExtendsOpt(on) @@ -1298,14 +1298,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(operator, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) listener: handleIdentifier(operator, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, operator) + listener: beginClassDeclaration(class, null, null, null, null, null, null, operator) parseClass(operator, class, class, operator) parseClassHeaderOpt(operator, class, class) parseClassExtendsOpt(operator) @@ -1327,12 +1327,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, out) + listener: beginClassDeclaration(class, null, null, null, null, null, null, out) parseClass(out, class, class, out) parseClassHeaderOpt(out, class, class) parseClassExtendsOpt(out) @@ -1354,14 +1354,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(part, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'part' as a name here., null, {lexeme: part}], part, part) listener: handleIdentifier(part, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, part) + listener: beginClassDeclaration(class, null, null, null, null, null, null, part) parseClass(part, class, class, part) parseClassHeaderOpt(part, class, class) parseClassExtendsOpt(part) @@ -1383,12 +1383,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, patch) + listener: beginClassDeclaration(class, null, null, null, null, null, null, patch) parseClass(patch, class, class, patch) parseClassHeaderOpt(patch, class, class) parseClassExtendsOpt(patch) @@ -1410,14 +1410,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(required, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'required' as a name here., null, {lexeme: required}], required, required) listener: handleIdentifier(required, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, required) + listener: beginClassDeclaration(class, null, null, null, null, null, null, required) parseClass(required, class, class, required) parseClassHeaderOpt(required, class, class) parseClassExtendsOpt(required) @@ -1439,14 +1439,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(rethrow, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'rethrow' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: rethrow}], rethrow, rethrow) listener: handleIdentifier(rethrow, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, rethrow) + listener: beginClassDeclaration(class, null, null, null, null, null, null, rethrow) parseClass(rethrow, class, class, rethrow) parseClassHeaderOpt(rethrow, class, class) parseClassExtendsOpt(rethrow) @@ -1468,14 +1468,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(return, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'return' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: return}], return, return) listener: handleIdentifier(return, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, return) + listener: beginClassDeclaration(class, null, null, null, null, null, null, return) parseClass(return, class, class, return) parseClassHeaderOpt(return, class, class) parseClassExtendsOpt(return) @@ -1497,14 +1497,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(set, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'set' as a name here., null, {lexeme: set}], set, set) listener: handleIdentifier(set, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, set) + listener: beginClassDeclaration(class, null, null, null, null, null, null, set) parseClass(set, class, class, set) parseClassHeaderOpt(set, class, class) parseClassExtendsOpt(set) @@ -1526,12 +1526,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, show) + listener: beginClassDeclaration(class, null, null, null, null, null, null, show) parseClass(show, class, class, show) parseClassHeaderOpt(show, class, class) parseClassExtendsOpt(show) @@ -1553,12 +1553,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, source) + listener: beginClassDeclaration(class, null, null, null, null, null, null, source) parseClass(source, class, class, source) parseClassHeaderOpt(source, class, class) parseClassExtendsOpt(source) @@ -1580,14 +1580,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(static, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'static' as a name here., null, {lexeme: static}], static, static) listener: handleIdentifier(static, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, static) + listener: beginClassDeclaration(class, null, null, null, null, null, null, static) parseClass(static, class, class, static) parseClassHeaderOpt(static, class, class) parseClassExtendsOpt(static) @@ -1609,14 +1609,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(super, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'super' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: super}], super, super) listener: handleIdentifier(super, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, super) + listener: beginClassDeclaration(class, null, null, null, null, null, null, super) parseClass(super, class, class, super) parseClassHeaderOpt(super, class, class) parseClassExtendsOpt(super) @@ -1638,14 +1638,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(switch, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'switch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: switch}], switch, switch) listener: handleIdentifier(switch, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, switch) + listener: beginClassDeclaration(class, null, null, null, null, null, null, switch) parseClass(switch, class, class, switch) parseClassHeaderOpt(switch, class, class) parseClassExtendsOpt(switch) @@ -1667,12 +1667,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, sync) + listener: beginClassDeclaration(class, null, null, null, null, null, null, sync) parseClass(sync, class, class, sync) parseClassHeaderOpt(sync, class, class) parseClassExtendsOpt(sync) @@ -1694,14 +1694,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(this, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) listener: handleIdentifier(this, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, this) + listener: beginClassDeclaration(class, null, null, null, null, null, null, this) parseClass(this, class, class, this) parseClassHeaderOpt(this, class, class) parseClassExtendsOpt(this) @@ -1723,14 +1723,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(throw, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'throw' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: throw}], throw, throw) listener: handleIdentifier(throw, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, throw) + listener: beginClassDeclaration(class, null, null, null, null, null, null, throw) parseClass(throw, class, class, throw) parseClassHeaderOpt(throw, class, class) parseClassExtendsOpt(throw) @@ -1752,14 +1752,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(true, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'true' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: true}], true, true) listener: handleIdentifier(true, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, true) + listener: beginClassDeclaration(class, null, null, null, null, null, null, true) parseClass(true, class, class, true) parseClassHeaderOpt(true, class, class) parseClassExtendsOpt(true) @@ -1781,14 +1781,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(try, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'try' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: try}], try, try) listener: handleIdentifier(try, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, try) + listener: beginClassDeclaration(class, null, null, null, null, null, null, try) parseClass(try, class, class, try) parseClassHeaderOpt(try, class, class) parseClassExtendsOpt(try) @@ -1810,14 +1810,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(typedef, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'typedef' as a name here., null, {lexeme: typedef}], typedef, typedef) listener: handleIdentifier(typedef, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, typedef) + listener: beginClassDeclaration(class, null, null, null, null, null, null, typedef) parseClass(typedef, class, class, typedef) parseClassHeaderOpt(typedef, class, class) parseClassExtendsOpt(typedef) @@ -1839,14 +1839,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(var, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'var' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: var}], var, var) listener: handleIdentifier(var, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, var) + listener: beginClassDeclaration(class, null, null, null, null, null, null, var) parseClass(var, class, class, var) parseClassHeaderOpt(var, class, class) parseClassExtendsOpt(var) @@ -1868,14 +1868,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(void, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'void' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: void}], void, void) listener: handleIdentifier(void, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, void) + listener: beginClassDeclaration(class, null, null, null, null, null, null, void) parseClass(void, class, class, void) parseClassHeaderOpt(void, class, class) parseClassExtendsOpt(void) @@ -1897,14 +1897,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(while, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'while' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: while}], while, while) listener: handleIdentifier(while, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, while) + listener: beginClassDeclaration(class, null, null, null, null, null, null, while) parseClass(while, class, class, while) parseClassHeaderOpt(while, class, class) parseClassExtendsOpt(while) @@ -1926,14 +1926,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(with, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with) listener: handleIdentifier(with, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, with) + listener: beginClassDeclaration(class, null, null, null, null, null, null, with) parseClass(with, class, class, with) parseClassHeaderOpt(with, class, class) parseClassExtendsOpt(with) @@ -1955,12 +1955,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, yield) + listener: beginClassDeclaration(class, null, null, null, null, null, null, yield) parseClass(yield, class, class, yield) parseClassHeaderOpt(yield, class, class) parseClassExtendsOpt(yield) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.expect index e05b758b3e9..f4aaa565169 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 @@ -231,7 +231,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'abstract' as a name here., null, {lexeme: abstract}], abstract, abstract) handleIdentifier(abstract, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, abstract) + beginNamedMixinApplication(class, null, null, null, null, null, null, abstract) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -249,7 +249,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, as) + beginNamedMixinApplication(class, null, null, null, null, null, null, as) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -267,7 +267,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'assert' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: assert}], assert, assert) handleIdentifier(assert, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, assert) + beginNamedMixinApplication(class, null, null, null, null, null, null, assert) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -284,7 +284,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(async, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, async) + beginNamedMixinApplication(class, null, null, null, null, null, null, async) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -301,7 +301,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(await, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, await) + beginNamedMixinApplication(class, null, null, null, null, null, null, await) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -319,7 +319,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'break' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: break}], break, break) handleIdentifier(break, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, break) + beginNamedMixinApplication(class, null, null, null, null, null, null, break) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -337,7 +337,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'case' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: case}], case, case) handleIdentifier(case, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, case) + beginNamedMixinApplication(class, null, null, null, null, null, null, case) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -355,7 +355,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'catch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: catch}], catch, catch) handleIdentifier(catch, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, catch) + beginNamedMixinApplication(class, null, null, null, null, null, null, catch) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -373,7 +373,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'class' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: class}], class, class) handleIdentifier(class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, class) + beginNamedMixinApplication(class, null, null, null, null, null, null, class) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -391,7 +391,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'const' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: const}], const, const) handleIdentifier(const, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, const) + beginNamedMixinApplication(class, null, null, null, null, null, null, const) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -409,7 +409,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'continue' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: continue}], continue, continue) handleIdentifier(continue, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, continue) + beginNamedMixinApplication(class, null, null, null, null, null, null, continue) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -427,7 +427,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, covariant) + beginNamedMixinApplication(class, null, null, null, null, null, null, covariant) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -445,7 +445,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'default' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: default}], default, default) handleIdentifier(default, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, default) + beginNamedMixinApplication(class, null, null, null, null, null, null, default) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -463,7 +463,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, deferred) + beginNamedMixinApplication(class, null, null, null, null, null, null, deferred) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -481,7 +481,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'do' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: do}], do, do) handleIdentifier(do, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, do) + beginNamedMixinApplication(class, null, null, null, null, null, null, do) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -499,7 +499,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, dynamic) + beginNamedMixinApplication(class, null, null, null, null, null, null, dynamic) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -517,7 +517,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'else' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: else}], else, else) handleIdentifier(else, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, else) + beginNamedMixinApplication(class, null, null, null, null, null, null, else) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -535,7 +535,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: enum}], enum, enum) handleIdentifier(enum, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, enum) + beginNamedMixinApplication(class, null, null, null, null, null, null, enum) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -553,7 +553,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, export) + beginNamedMixinApplication(class, null, null, null, null, null, null, export) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -571,7 +571,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'extends' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: extends}], extends, extends) handleIdentifier(extends, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, extends) + beginNamedMixinApplication(class, null, null, null, null, null, null, extends) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -589,7 +589,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, extension) + beginNamedMixinApplication(class, null, null, null, null, null, null, extension) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -607,7 +607,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, external) + beginNamedMixinApplication(class, null, null, null, null, null, null, external) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -625,7 +625,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, factory) + beginNamedMixinApplication(class, null, null, null, null, null, null, factory) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -643,7 +643,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'false' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: false}], false, false) handleIdentifier(false, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, false) + beginNamedMixinApplication(class, null, null, null, null, null, null, false) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -661,7 +661,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'final' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: final}], final, final) handleIdentifier(final, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, final) + beginNamedMixinApplication(class, null, null, null, null, null, null, final) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -679,7 +679,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'finally' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: finally}], finally, finally) handleIdentifier(finally, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, finally) + beginNamedMixinApplication(class, null, null, null, null, null, null, finally) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -697,7 +697,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'for' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: for}], for, for) handleIdentifier(for, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, for) + beginNamedMixinApplication(class, null, null, null, null, null, null, for) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -715,7 +715,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, Function) + beginNamedMixinApplication(class, null, null, null, null, null, null, Function) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -733,7 +733,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, get) + beginNamedMixinApplication(class, null, null, null, null, null, null, get) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -750,7 +750,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(hide, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, hide) + beginNamedMixinApplication(class, null, null, null, null, null, null, hide) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -768,7 +768,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'if' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: if}], if, if) handleIdentifier(if, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, if) + beginNamedMixinApplication(class, null, null, null, null, null, null, if) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -786,7 +786,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, implements) + beginNamedMixinApplication(class, null, null, null, null, null, null, implements) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -804,7 +804,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, import) + beginNamedMixinApplication(class, null, null, null, null, null, null, import) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -822,7 +822,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'in' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: in}], in, in) handleIdentifier(in, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, in) + beginNamedMixinApplication(class, null, null, null, null, null, null, in) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -839,7 +839,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(inout, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, inout) + beginNamedMixinApplication(class, null, null, null, null, null, null, inout) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -857,7 +857,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, interface) + beginNamedMixinApplication(class, null, null, null, null, null, null, interface) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -875,7 +875,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'is' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: is}], is, is) handleIdentifier(is, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, is) + beginNamedMixinApplication(class, null, null, null, null, null, null, is) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -893,7 +893,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, late) + beginNamedMixinApplication(class, null, null, null, null, null, null, late) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -911,7 +911,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, library) + beginNamedMixinApplication(class, null, null, null, null, null, null, library) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -929,7 +929,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, mixin) + beginNamedMixinApplication(class, null, null, null, null, null, null, mixin) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -946,7 +946,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(native, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, native) + beginNamedMixinApplication(class, null, null, null, null, null, null, native) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -964,7 +964,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'new' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: new}], new, new) handleIdentifier(new, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, new) + beginNamedMixinApplication(class, null, null, null, null, null, null, new) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -982,7 +982,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'null' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: null}], null, null) handleIdentifier(null, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, null) + beginNamedMixinApplication(class, null, null, null, null, null, null, null) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -999,7 +999,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(of, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, of) + beginNamedMixinApplication(class, null, null, null, null, null, null, of) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1016,7 +1016,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(on, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, on) + beginNamedMixinApplication(class, null, null, null, null, null, null, on) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1034,7 +1034,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, operator) + beginNamedMixinApplication(class, null, null, null, null, null, null, operator) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1051,7 +1051,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(out, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, out) + beginNamedMixinApplication(class, null, null, null, null, null, null, out) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1069,7 +1069,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, part) + beginNamedMixinApplication(class, null, null, null, null, null, null, part) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1086,7 +1086,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(patch, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, patch) + beginNamedMixinApplication(class, null, null, null, null, null, null, patch) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1104,7 +1104,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, required) + beginNamedMixinApplication(class, null, null, null, null, null, null, required) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1122,7 +1122,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'rethrow' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: rethrow}], rethrow, rethrow) handleIdentifier(rethrow, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, rethrow) + beginNamedMixinApplication(class, null, null, null, null, null, null, rethrow) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1140,7 +1140,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'return' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: return}], return, return) handleIdentifier(return, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, return) + beginNamedMixinApplication(class, null, null, null, null, null, null, return) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1158,7 +1158,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, set) + beginNamedMixinApplication(class, null, null, null, null, null, null, set) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1175,7 +1175,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(show, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, show) + beginNamedMixinApplication(class, null, null, null, null, null, null, show) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1192,7 +1192,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(source, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, source) + beginNamedMixinApplication(class, null, null, null, null, null, null, source) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1210,7 +1210,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, static) + beginNamedMixinApplication(class, null, null, null, null, null, null, static) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1228,7 +1228,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'super' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: super}], super, super) handleIdentifier(super, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, super) + beginNamedMixinApplication(class, null, null, null, null, null, null, super) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1246,7 +1246,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'switch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: switch}], switch, switch) handleIdentifier(switch, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, switch) + beginNamedMixinApplication(class, null, null, null, null, null, null, switch) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1263,7 +1263,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(sync, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, sync) + beginNamedMixinApplication(class, null, null, null, null, null, null, sync) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1281,7 +1281,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) handleIdentifier(this, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, this) + beginNamedMixinApplication(class, null, null, null, null, null, null, this) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1299,7 +1299,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'throw' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: throw}], throw, throw) handleIdentifier(throw, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, throw) + beginNamedMixinApplication(class, null, null, null, null, null, null, throw) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1317,7 +1317,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'true' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: true}], true, true) handleIdentifier(true, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, true) + beginNamedMixinApplication(class, null, null, null, null, null, null, true) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1335,7 +1335,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'try' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: try}], try, try) handleIdentifier(try, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, try) + beginNamedMixinApplication(class, null, null, null, null, null, null, try) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1353,7 +1353,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[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, typedef) + beginNamedMixinApplication(class, null, null, null, null, null, null, typedef) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1371,7 +1371,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'var' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: var}], var, var) handleIdentifier(var, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, var) + beginNamedMixinApplication(class, null, null, null, null, null, null, var) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1389,7 +1389,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'void' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: void}], void, void) handleIdentifier(void, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, void) + beginNamedMixinApplication(class, null, null, null, null, null, null, void) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1407,7 +1407,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'while' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: while}], while, while) handleIdentifier(while, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, while) + beginNamedMixinApplication(class, null, null, null, null, null, null, while) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1425,7 +1425,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with) handleIdentifier(with, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, with) + beginNamedMixinApplication(class, null, null, null, null, null, null, with) handleIdentifier(A, typeReference) handleNoTypeArguments(with) handleType(A, null) @@ -1442,7 +1442,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(yield, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, yield) + beginNamedMixinApplication(class, 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 56ea46f882d..d607a7c9cae 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 @@ -7,14 +7,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(abstract, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'abstract' as a name here., null, {lexeme: abstract}], abstract, abstract) listener: handleIdentifier(abstract, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, abstract) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, abstract) parseNamedMixinApplication(abstract, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -35,14 +35,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(as, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'as' as a name here., null, {lexeme: as}], as, as) listener: handleIdentifier(as, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, as) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, as) parseNamedMixinApplication(as, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -63,14 +63,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(assert, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'assert' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: assert}], assert, assert) listener: handleIdentifier(assert, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, assert) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, assert) parseNamedMixinApplication(assert, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -91,12 +91,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, async) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, async) parseNamedMixinApplication(async, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -117,12 +117,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, await) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, await) parseNamedMixinApplication(await, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -143,14 +143,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(break, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'break' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: break}], break, break) listener: handleIdentifier(break, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, break) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, break) parseNamedMixinApplication(break, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -171,14 +171,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(case, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'case' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: case}], case, case) listener: handleIdentifier(case, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, case) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, case) parseNamedMixinApplication(case, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -199,14 +199,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(catch, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'catch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: catch}], catch, catch) listener: handleIdentifier(catch, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, catch) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, catch) parseNamedMixinApplication(catch, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -227,14 +227,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(class, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'class' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: class}], class, class) listener: handleIdentifier(class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, class) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, class) parseNamedMixinApplication(class, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -255,14 +255,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(const, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'const' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: const}], const, const) listener: handleIdentifier(const, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, const) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, const) parseNamedMixinApplication(const, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -283,14 +283,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(continue, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'continue' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: continue}], continue, continue) listener: handleIdentifier(continue, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, continue) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, continue) parseNamedMixinApplication(continue, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -311,14 +311,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(covariant, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'covariant' as a name here., null, {lexeme: covariant}], covariant, covariant) listener: handleIdentifier(covariant, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, covariant) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, covariant) parseNamedMixinApplication(covariant, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -339,14 +339,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(default, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'default' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: default}], default, default) listener: handleIdentifier(default, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, default) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, default) parseNamedMixinApplication(default, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -367,14 +367,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(deferred, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'deferred' as a name here., null, {lexeme: deferred}], deferred, deferred) listener: handleIdentifier(deferred, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, deferred) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, deferred) parseNamedMixinApplication(deferred, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -395,14 +395,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(do, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'do' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: do}], do, do) listener: handleIdentifier(do, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, do) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, do) parseNamedMixinApplication(do, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -423,14 +423,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(dynamic, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'dynamic' as a name here., null, {lexeme: dynamic}], dynamic, dynamic) listener: handleIdentifier(dynamic, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, dynamic) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, dynamic) parseNamedMixinApplication(dynamic, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -451,14 +451,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(else, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'else' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: else}], else, else) listener: handleIdentifier(else, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, else) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, else) parseNamedMixinApplication(else, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -479,14 +479,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(enum, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: enum}], enum, enum) listener: handleIdentifier(enum, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, enum) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, enum) parseNamedMixinApplication(enum, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -507,14 +507,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(export, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'export' as a name here., null, {lexeme: export}], export, export) listener: handleIdentifier(export, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, export) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, export) parseNamedMixinApplication(export, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -535,14 +535,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extends, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'extends' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: extends}], extends, extends) listener: handleIdentifier(extends, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, extends) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, extends) parseNamedMixinApplication(extends, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -563,14 +563,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extension, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'extension' as a name here., null, {lexeme: extension}], extension, extension) listener: handleIdentifier(extension, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, extension) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, extension) parseNamedMixinApplication(extension, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -591,14 +591,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(external, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'external' as a name here., null, {lexeme: external}], external, external) listener: handleIdentifier(external, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, external) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, external) parseNamedMixinApplication(external, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -619,14 +619,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(factory, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'factory' as a name here., null, {lexeme: factory}], factory, factory) listener: handleIdentifier(factory, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, factory) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, factory) parseNamedMixinApplication(factory, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -647,14 +647,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(false, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'false' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: false}], false, false) listener: handleIdentifier(false, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, false) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, false) parseNamedMixinApplication(false, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -675,14 +675,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(final, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'final' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: final}], final, final) listener: handleIdentifier(final, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, final) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, final) parseNamedMixinApplication(final, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -703,14 +703,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(finally, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'finally' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: finally}], finally, finally) listener: handleIdentifier(finally, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, finally) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, finally) parseNamedMixinApplication(finally, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -731,14 +731,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(for, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'for' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: for}], for, for) listener: handleIdentifier(for, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, for) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, for) parseNamedMixinApplication(for, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -759,14 +759,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(Function, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) listener: handleIdentifier(Function, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, Function) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, Function) parseNamedMixinApplication(Function, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -787,14 +787,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(get, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'get' as a name here., null, {lexeme: get}], get, get) listener: handleIdentifier(get, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, get) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, get) parseNamedMixinApplication(get, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -815,12 +815,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, hide) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, hide) parseNamedMixinApplication(hide, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -841,14 +841,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(if, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'if' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: if}], if, if) listener: handleIdentifier(if, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, if) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, if) parseNamedMixinApplication(if, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -869,14 +869,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(implements, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'implements' as a name here., null, {lexeme: implements}], implements, implements) listener: handleIdentifier(implements, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, implements) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, implements) parseNamedMixinApplication(implements, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -897,14 +897,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(import, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'import' as a name here., null, {lexeme: import}], import, import) listener: handleIdentifier(import, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, import) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, import) parseNamedMixinApplication(import, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -925,14 +925,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(in, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'in' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: in}], in, in) listener: handleIdentifier(in, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, in) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, in) parseNamedMixinApplication(in, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -953,12 +953,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, inout) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, inout) parseNamedMixinApplication(inout, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -979,14 +979,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(interface, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'interface' as a name here., null, {lexeme: interface}], interface, interface) listener: handleIdentifier(interface, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, interface) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, interface) parseNamedMixinApplication(interface, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1007,14 +1007,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(is, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'is' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: is}], is, is) listener: handleIdentifier(is, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, is) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, is) parseNamedMixinApplication(is, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1035,14 +1035,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(late, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'late' as a name here., null, {lexeme: late}], late, late) listener: handleIdentifier(late, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, late) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, late) parseNamedMixinApplication(late, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1063,14 +1063,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(library, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'library' as a name here., null, {lexeme: library}], library, library) listener: handleIdentifier(library, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, library) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, library) parseNamedMixinApplication(library, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1091,14 +1091,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(mixin, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'mixin' as a name here., null, {lexeme: mixin}], mixin, mixin) listener: handleIdentifier(mixin, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, mixin) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, mixin) parseNamedMixinApplication(mixin, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1119,12 +1119,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, native) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, native) parseNamedMixinApplication(native, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1145,14 +1145,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(new, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'new' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: new}], new, new) listener: handleIdentifier(new, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, new) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, new) parseNamedMixinApplication(new, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1173,14 +1173,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(null, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'null' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: null}], null, null) listener: handleIdentifier(null, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, null) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, null) parseNamedMixinApplication(null, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1201,12 +1201,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, of) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, of) parseNamedMixinApplication(of, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1227,12 +1227,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, on) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, on) parseNamedMixinApplication(on, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1253,14 +1253,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(operator, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) listener: handleIdentifier(operator, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, operator) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, operator) parseNamedMixinApplication(operator, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1281,12 +1281,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, out) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, out) parseNamedMixinApplication(out, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1307,14 +1307,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(part, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'part' as a name here., null, {lexeme: part}], part, part) listener: handleIdentifier(part, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, part) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, part) parseNamedMixinApplication(part, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1335,12 +1335,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, patch) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, patch) parseNamedMixinApplication(patch, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1361,14 +1361,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(required, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'required' as a name here., null, {lexeme: required}], required, required) listener: handleIdentifier(required, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, required) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, required) parseNamedMixinApplication(required, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1389,14 +1389,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(rethrow, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'rethrow' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: rethrow}], rethrow, rethrow) listener: handleIdentifier(rethrow, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, rethrow) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, rethrow) parseNamedMixinApplication(rethrow, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1417,14 +1417,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(return, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'return' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: return}], return, return) listener: handleIdentifier(return, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, return) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, return) parseNamedMixinApplication(return, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1445,14 +1445,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(set, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'set' as a name here., null, {lexeme: set}], set, set) listener: handleIdentifier(set, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, set) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, set) parseNamedMixinApplication(set, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1473,12 +1473,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, show) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, show) parseNamedMixinApplication(show, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1499,12 +1499,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, source) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, source) parseNamedMixinApplication(source, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1525,14 +1525,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(static, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'static' as a name here., null, {lexeme: static}], static, static) listener: handleIdentifier(static, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, static) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, static) parseNamedMixinApplication(static, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1553,14 +1553,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(super, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'super' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: super}], super, super) listener: handleIdentifier(super, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, super) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, super) parseNamedMixinApplication(super, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1581,14 +1581,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(switch, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'switch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: switch}], switch, switch) listener: handleIdentifier(switch, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, switch) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, switch) parseNamedMixinApplication(switch, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1609,12 +1609,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, sync) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, sync) parseNamedMixinApplication(sync, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1635,14 +1635,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(this, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) listener: handleIdentifier(this, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, this) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, this) parseNamedMixinApplication(this, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1663,14 +1663,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(throw, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'throw' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: throw}], throw, throw) listener: handleIdentifier(throw, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, throw) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, throw) parseNamedMixinApplication(throw, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1691,14 +1691,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(true, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'true' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: true}], true, true) listener: handleIdentifier(true, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, true) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, true) parseNamedMixinApplication(true, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1719,14 +1719,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(try, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'try' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: try}], try, try) listener: handleIdentifier(try, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, try) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, try) parseNamedMixinApplication(try, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1747,14 +1747,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(typedef, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'typedef' as a name here., null, {lexeme: typedef}], typedef, typedef) listener: handleIdentifier(typedef, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, typedef) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, typedef) parseNamedMixinApplication(typedef, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1775,14 +1775,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(var, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'var' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: var}], var, var) listener: handleIdentifier(var, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, var) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, var) parseNamedMixinApplication(var, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1803,14 +1803,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(void, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'void' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: void}], void, void) listener: handleIdentifier(void, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, void) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, void) parseNamedMixinApplication(void, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1831,14 +1831,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(while, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'while' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: while}], while, while) listener: handleIdentifier(while, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, while) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, while) parseNamedMixinApplication(while, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1859,14 +1859,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(with, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with) listener: handleIdentifier(with, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, null, null, with) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, with) parseNamedMixinApplication(with, class, class) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(with) @@ -1887,12 +1887,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, yield) + listener: beginNamedMixinApplication(class, 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 988b27908fb..29a5faf3a43 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, ) + beginClassDeclaration(class, null, null, null, null, null, null, ) handleNoType() handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.intertwined.expect index 2a5bbeb4dab..952f3ae7be9 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 @@ -7,7 +7,7 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) insertSyntheticIdentifier(class, classOrMixinDeclaration, message: Message[ExpectedIdentifier, Expected an identifier, but got ''., Try inserting an identifier before ''., {lexeme: }], messageOnToken: null) @@ -17,7 +17,7 @@ parseUnit(class) rewriter() listener: handleIdentifier(, classOrMixinDeclaration) listener: handleNoTypeVariables() - listener: beginClassDeclaration(class, null, null, null, null, null, ) + listener: beginClassDeclaration(class, null, null, null, null, null, null, ) parseClass(, class, class, ) parseClassHeaderOpt(, class, class) parseClassExtendsOpt() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.expect index 8e464d3312a..6c2638d875d 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -67,7 +67,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.intertwined.expect index 54c96909298..16955d022b1 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -73,12 +73,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect index a96cd00aa43..d90db7c008c 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect index cf9367131fc..e03f5264aaa 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect index 4ad34f1375a..704d4db02e2 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect index a349fed2630..1c4f89163ff 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.expect index 9360134f9f1..7349625229e 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.intertwined.expect index f36a7c9dbdc..0721ab4c056 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.expect index 337e42d31e3..189e83bfee7 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.intertwined.expect index f7d82ee8b70..c6848acec6d 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect index 3505baca231..60344c62754 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -127,7 +127,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() @@ -199,7 +199,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect index 3c74b2267d6..8f69c770f57 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -83,12 +83,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -196,12 +196,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect index 6e82920b9fc..ff4a4e7fb43 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect index d1612d93575..f1a7e7913a7 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect index 3b987a0faab..6c9848c9353 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect @@ -32,7 +32,7 @@ beginCompilationUnit(enum) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect index f17501b8667..b7a3ed243db 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 @@ -43,12 +43,12 @@ parseUnit(enum) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect index 0b6781e63c9..5c3a56e539a 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -93,7 +93,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, B) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -157,7 +157,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B2, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, B2) + beginClassDeclaration(class, null, null, null, null, null, null, B2) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -223,7 +223,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B3, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, B3) + beginClassDeclaration(class, null, null, null, null, null, null, B3) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -314,7 +314,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -389,7 +389,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, null, D) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -456,7 +456,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(E, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, E) + beginClassDeclaration(class, null, null, null, null, null, null, E) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect index f78b8f736c6..69d22ac1e2a 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -122,12 +122,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -255,12 +255,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B2) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B2) parseClass(B2, class, class, B2) parseClassHeaderOpt(B2, class, class) parseClassExtendsOpt(B2) @@ -396,12 +396,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B3) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B3) parseClass(B3, class, class, B3) parseClassHeaderOpt(B3, class, class) parseClassExtendsOpt(B3) @@ -582,12 +582,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -732,12 +732,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, D) + listener: beginClassDeclaration(class, null, null, null, null, null, null, D) parseClass(D, class, class, D) parseClassHeaderOpt(D, class, class) parseClassExtendsOpt(D) @@ -868,12 +868,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, E) + listener: beginClassDeclaration(class, null, null, null, null, null, null, E) parseClass(E, class, class, E) parseClassHeaderOpt(E, class, class) parseClassExtendsOpt(E) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect index 3954e4d076a..029f73b4ac8 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -67,7 +67,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, B) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -130,7 +130,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B2, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, B2) + beginClassDeclaration(class, null, null, null, null, null, null, B2) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -195,7 +195,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B3, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, B3) + beginClassDeclaration(class, null, null, null, null, null, null, B3) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -285,7 +285,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -359,7 +359,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, null, D) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -425,7 +425,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(E, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, E) + beginClassDeclaration(class, null, null, null, null, null, null, E) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect index 63197b0aad6..755d7707864 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -122,12 +122,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -252,12 +252,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B2) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B2) parseClass(B2, class, class, B2) parseClassHeaderOpt(B2, class, class) parseClassExtendsOpt(B2) @@ -390,12 +390,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B3) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B3) parseClass(B3, class, class, B3) parseClassHeaderOpt(B3, class, class) parseClassExtendsOpt(B3) @@ -573,12 +573,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -720,12 +720,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, D) + listener: beginClassDeclaration(class, null, null, null, null, null, null, D) parseClass(D, class, class, D) parseClassHeaderOpt(D, class, class) parseClassExtendsOpt(D) @@ -853,12 +853,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, E) + listener: beginClassDeclaration(class, null, null, null, null, null, null, E) parseClass(E, class, class, E) parseClassHeaderOpt(E, class, class) parseClassExtendsOpt(E) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect index 0c8381fa1b9..1ccac689d1d 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -134,7 +134,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -213,7 +213,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -248,7 +248,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect index 83da049bcee..d857b4b4b25 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -128,12 +128,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -307,12 +307,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -383,12 +383,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.expect index 0f23a522c8c..843c15c150a 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.expect @@ -965,7 +965,7 @@ beginCompilationUnit(Future) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(await, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, await) + beginClassDeclaration(class, null, null, null, null, null, null, await) handleNoType(await) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.intertwined.expect index 4fcdde81bfa..1df2d236aef 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 @@ -2292,12 +2292,12 @@ parseUnit(Future) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, await) + listener: beginClassDeclaration(class, null, null, null, null, null, null, await) parseClass(await, class, class, await) parseClassHeaderOpt(await, class, class) parseClassExtendsOpt(await) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.expect index 67b196b27cc..fda36bef1aa 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, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, null, WrapperClass) handleNoType(WrapperClass) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.intertwined.expect index 3dd589a13d7..42f1610d7d2 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, WrapperClass) parseClassHeaderOpt(WrapperClass, class, class) parseClassExtendsOpt(WrapperClass) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect index 067690e7190..ec4e88e16ea 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect @@ -494,7 +494,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(WrapperClass, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, null, WrapperClass) handleNoType(WrapperClass) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect index 04e3dcc94f3..c7836c441ad 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, WrapperClass) parseClassHeaderOpt(WrapperClass, class, class) parseClassExtendsOpt(WrapperClass) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.expect index 276a7ab3fe4..d043450aaef 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.intertwined.expect index ca461840117..8a119ae12ba 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 @@ -50,12 +50,12 @@ parseUnit(UnmatchedToken(()) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect index a385e79b7b9..44b620d6947 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect index 124aecd7fb6..a3a2a845ebe 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect index 951214f1e6b..a16057ad2e6 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect index 8f80716ba40..17258307942 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.expect index 5b3efb517fb..c9e1e928416 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, B) + beginClassDeclaration(class, null, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() @@ -52,7 +52,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(M1, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, M1) + beginClassDeclaration(class, null, null, null, null, null, null, M1) handleNoType(M1) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.intertwined.expect index bb37733f2ad..a9f54083627 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -57,12 +57,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, M1) + listener: beginClassDeclaration(class, null, null, null, null, null, null, M1) parseClass(M1, class, class, M1) parseClassHeaderOpt(M1, class, class) parseClassExtendsOpt(M1) diff --git a/pkg/front_end/parser_testcases/extension_named_type.dart.expect b/pkg/front_end/parser_testcases/extension_named_type.dart.expect index a67f347e27e..be3c72b66cc 100644 --- a/pkg/front_end/parser_testcases/extension_named_type.dart.expect +++ b/pkg/front_end/parser_testcases/extension_named_type.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect index 3216a1a24fc..2846145562d 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/extension_type.dart.expect b/pkg/front_end/parser_testcases/extension_type.dart.expect index 902f4d3266b..41b71a7979d 100644 --- a/pkg/front_end/parser_testcases/extension_type.dart.expect +++ b/pkg/front_end/parser_testcases/extension_type.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/extension_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/extension_type.dart.intertwined.expect index 4b7c9c8a96f..cd1c40c963b 100644 --- a/pkg/front_end/parser_testcases/extension_type.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extension_type.dart.intertwined.expect @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/extensions/covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/covariant.dart.expect index 9493e0248ca..b6e19defed7 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -25,7 +25,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) diff --git a/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect index 0befd9a7894..70da9a0bd9f 100644 --- a/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -34,12 +34,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect index d9a92940ab1..7cf2b8f28c8 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -19,7 +19,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) diff --git a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect index 000ae0c12f8..ae7de379e63 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -34,12 +34,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/extensions/static.dart.expect b/pkg/front_end/parser_testcases/extensions/static.dart.expect index e6dbacc2a17..300d6ab236e 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -19,7 +19,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) diff --git a/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect index 63ca86ad4fd..c3083a05fa6 100644 --- a/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -34,12 +34,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect index 90b53bb5ad8..3a7c675aaa4 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -25,7 +25,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) diff --git a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect index 7c3e910a1f0..f8eba9ee85f 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -34,12 +34,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/general/augment_super.dart.expect b/pkg/front_end/parser_testcases/general/augment_super.dart.expect index 51660f2668e..c425a261acb 100644 --- a/pkg/front_end/parser_testcases/general/augment_super.dart.expect +++ b/pkg/front_end/parser_testcases/general/augment_super.dart.expect @@ -473,7 +473,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect index 3a018c9d356..3bfe7dd105d 100644 --- a/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect @@ -711,12 +711,12 @@ parseUnit(augment) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.expect index a1e2126d981..79245b5eff5 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, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, null, WrapperClass) handleNoType(WrapperClass) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.intertwined.expect index 404f233027d..bfdf61fb5bd 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, WrapperClass) parseClassHeaderOpt(WrapperClass, class, class) parseClassExtendsOpt(WrapperClass) diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect index 487d4d9c7e8..7f422fbd24b 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, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, null, WrapperClass) handleNoType(WrapperClass) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect index 7049db0fa41..f3760ac8624 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, WrapperClass) parseClassHeaderOpt(WrapperClass, class, class) parseClassExtendsOpt(WrapperClass) diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.expect index adb5514c467..c68acca3cb2 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, ConfigurationService) + beginClassDeclaration(class, null, null, null, null, null, null, ConfigurationService) handleNoType(ConfigurationService) handleClassExtends(null, 1) handleClassNoWithClause() @@ -275,7 +275,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Configuration, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Configuration) + beginClassDeclaration(class, null, null, null, null, null, null, Configuration) handleNoType(Configuration) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect index d3ec34b8363..ed9e6e3a4f5 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, ConfigurationService) + listener: beginClassDeclaration(class, null, null, null, null, null, null, ConfigurationService) parseClass(ConfigurationService, class, class, ConfigurationService) parseClassHeaderOpt(ConfigurationService, class, class) parseClassExtendsOpt(ConfigurationService) @@ -511,12 +511,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Configuration) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Configuration) parseClass(Configuration, class, class, Configuration) parseClassHeaderOpt(Configuration, class, class) parseClassExtendsOpt(Configuration) diff --git a/pkg/front_end/parser_testcases/general/issue_45703.dart.expect b/pkg/front_end/parser_testcases/general/issue_45703.dart.expect index cadc75cd914..c2a14f066e1 100644 --- a/pkg/front_end/parser_testcases/general/issue_45703.dart.expect +++ b/pkg/front_end/parser_testcases/general/issue_45703.dart.expect @@ -39,7 +39,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) handleIdentifier(Function, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Function) + beginClassDeclaration(class, null, null, null, null, null, null, Function) handleNoType(Function) handleClassExtends(null, 1) handleClassNoWithClause() @@ -63,7 +63,7 @@ beginCompilationUnit(class) handleNoType(Function) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/issue_45703.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45703.dart.intertwined.expect index b914ab366a2..25f164cadb1 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 @@ -7,14 +7,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(Function, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) listener: handleIdentifier(Function, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, Function) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Function) parseClass(Function, class, class, Function) parseClassHeaderOpt(Function, class, class) parseClassExtendsOpt(Function) @@ -36,7 +36,7 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -53,7 +53,7 @@ parseUnit(class) listener: handleNoType(Function) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(>, class, class, C) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) diff --git a/pkg/front_end/parser_testcases/general/metadata.dart.expect b/pkg/front_end/parser_testcases/general/metadata.dart.expect index f40ab9291c0..0c1e5a6953d 100644 --- a/pkg/front_end/parser_testcases/general/metadata.dart.expect +++ b/pkg/front_end/parser_testcases/general/metadata.dart.expect @@ -107,7 +107,7 @@ beginCompilationUnit(@) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -939,7 +939,7 @@ beginCompilationUnit(@) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect index 240f084c054..e1d89285fa7 100644 --- a/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect @@ -229,12 +229,12 @@ parseUnit(@) listener: endMetadata(@, ., class) listener: endMetadataStar(10) parseTopLevelKeywordDeclaration(), class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -1703,12 +1703,12 @@ parseUnit(@) listener: endMetadata(@, ., class) listener: endMetadataStar(9) parseTopLevelKeywordDeclaration(), class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect index e1efb1151bd..88a0472cd84 100644 --- a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect +++ b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect @@ -46,7 +46,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -147,7 +147,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, null, D) handleNoType(D) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect index 4054f62cfce..b9ddd0bf006 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -233,12 +233,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, D) + listener: beginClassDeclaration(class, null, null, null, null, null, null, D) parseClass(D, class, class, D) parseClassHeaderOpt(D, class, class) parseClassExtendsOpt(D) diff --git a/pkg/front_end/parser_testcases/general/operator_01.dart.expect b/pkg/front_end/parser_testcases/general/operator_01.dart.expect index 69dabc72786..978f73a4195 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect index c5f6575cff9..97a4ef22b78 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect index 07332fee612..81ee8617bc1 100644 --- a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect +++ b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect @@ -11,7 +11,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) handleIdentifier(operator, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, operator) + beginClassDeclaration(class, null, null, null, null, null, null, operator) handleNoType(operator) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.intertwined.expect index 6a175e3d61a..371fe68d72b 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 @@ -7,14 +7,14 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(operator, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) listener: handleIdentifier(operator, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, operator) + listener: beginClassDeclaration(class, null, null, null, null, null, null, operator) parseClass(operator, class, class, operator) parseClassHeaderOpt(operator, class, class) parseClassExtendsOpt(operator) diff --git a/pkg/front_end/parser_testcases/inline_class/inline_class.dart.expect b/pkg/front_end/parser_testcases/inline_class/inline_class.dart.expect index 961f2c19694..da473e76b11 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 @@ -4,7 +4,7 @@ beginCompilationUnit(inline) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, inline, null, null, Class) + beginClassDeclaration(class, null, null, inline, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -19,7 +19,7 @@ beginCompilationUnit(inline) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, inline, null, null, Class) + beginNamedMixinApplication(class, null, null, inline, 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 c87a73304f5..9ada43329da 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 @@ -7,12 +7,12 @@ parseUnit(inline) listener: beginMetadataStar(inline) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, inline, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, inline, null, null, class) + parseClassOrNamedMixinApplication(null, null, inline, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, inline, null, null, Class) + listener: beginClassDeclaration(class, null, null, inline, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -34,12 +34,12 @@ parseUnit(inline) listener: beginMetadataStar(inline) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, inline, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, inline, null, null, class) + parseClassOrNamedMixinApplication(null, null, inline, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, inline, null, null, Class) + listener: beginNamedMixinApplication(class, null, null, inline, null, null, null, Class) parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) 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 dc43863e2ed..bf0a039a0a1 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, Class) + beginClassDeclaration(class, null, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -84,7 +84,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -110,7 +110,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, Class) + beginNamedMixinApplication(class, null, null, null, null, null, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -139,7 +139,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, null, null, Class) + beginNamedMixinApplication(class, 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 2500150f7ab..28753398e53 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 @@ -30,12 +30,12 @@ parseUnit(augment) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -82,12 +82,12 @@ parseUnit(augment) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -132,12 +132,12 @@ parseUnit(augment) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Class) + listener: beginNamedMixinApplication(class, null, null, null, null, null, null, Class) parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) @@ -183,12 +183,12 @@ parseUnit(augment) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Class) + listener: beginNamedMixinApplication(class, 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 6e7e12eac09..b6d1d92fee6 100644 --- a/pkg/front_end/parser_testcases/macros/macro_class.dart.expect +++ b/pkg/front_end/parser_testcases/macros/macro_class.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(macro) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, macro, null, null, null, Class) + beginClassDeclaration(class, null, macro, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -19,7 +19,7 @@ beginCompilationUnit(macro) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, macro, null, null, null, Class) + beginClassDeclaration(abstract, abstract, macro, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -34,7 +34,7 @@ beginCompilationUnit(macro) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, macro, null, null, null, Class) + beginNamedMixinApplication(class, null, macro, null, null, null, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) @@ -51,7 +51,7 @@ beginCompilationUnit(macro) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(abstract, abstract, macro, null, null, null, Class) + beginNamedMixinApplication(abstract, abstract, macro, null, null, null, null, Class) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) 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 ac2c701555c..2dfd138e0e8 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 @@ -7,12 +7,12 @@ parseUnit(macro) listener: beginMetadataStar(macro) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, macro, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, macro, null, null, null, class) + parseClassOrNamedMixinApplication(null, macro, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, macro, null, null, null, Class) + listener: beginClassDeclaration(class, null, macro, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -34,12 +34,12 @@ parseUnit(macro) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, macro, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, macro, null, null, null, class) + parseClassOrNamedMixinApplication(abstract, macro, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, macro, null, null, null, Class) + listener: beginClassDeclaration(abstract, abstract, macro, null, null, null, null, Class) parseClass(Class, abstract, class, Class) parseClassHeaderOpt(Class, abstract, class) parseClassExtendsOpt(Class) @@ -61,12 +61,12 @@ parseUnit(macro) listener: beginMetadataStar(macro) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, macro, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, macro, null, null, null, class) + parseClassOrNamedMixinApplication(null, macro, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, macro, null, null, null, Class) + listener: beginNamedMixinApplication(class, null, macro, null, null, null, null, Class) parseNamedMixinApplication(Class, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) @@ -87,12 +87,12 @@ parseUnit(macro) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, macro, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, macro, null, null, null, class) + parseClassOrNamedMixinApplication(abstract, macro, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(abstract, abstract, macro, null, null, null, Class) + listener: beginNamedMixinApplication(abstract, abstract, macro, null, null, null, null, Class) parseNamedMixinApplication(Class, abstract, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart new file mode 100644 index 00000000000..0cc7865b4c0 --- /dev/null +++ b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart @@ -0,0 +1,6 @@ +mixin class A {} + +abstract mixin class B {} + +mixin M {} +mixin class C = Object with M; diff --git a/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.expect b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.expect new file mode 100644 index 00000000000..3caa873d980 --- /dev/null +++ b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.expect @@ -0,0 +1,62 @@ +beginCompilationUnit(mixin) + beginMetadataStar(mixin) + endMetadataStar(0) + beginClassOrMixinOrNamedMixinApplicationPrelude(class) + handleIdentifier(A, classOrMixinDeclaration) + handleNoTypeVariables({) + beginClassDeclaration(class, null, null, null, null, null, mixin, A) + handleNoType(A) + handleClassExtends(null, 1) + handleClassNoWithClause() + handleImplements(null, 0) + handleClassHeader(class, class, null) + beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) + endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) + endClassDeclaration(class, }) + endTopLevelDeclaration(abstract) + beginMetadataStar(abstract) + endMetadataStar(0) + beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) + handleIdentifier(B, classOrMixinDeclaration) + handleNoTypeVariables({) + beginClassDeclaration(abstract, abstract, null, null, null, null, mixin, B) + handleNoType(B) + handleClassExtends(null, 1) + handleClassNoWithClause() + handleImplements(null, 0) + handleClassHeader(abstract, class, null) + beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) + endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) + endClassDeclaration(abstract, }) + endTopLevelDeclaration(mixin) + beginMetadataStar(mixin) + endMetadataStar(0) + beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) + handleIdentifier(M, classOrMixinDeclaration) + handleNoTypeVariables({) + beginMixinDeclaration(null, null, mixin, M) + handleMixinOn(null, 0) + handleImplements(null, 0) + handleMixinHeader(mixin) + beginClassOrMixinOrExtensionBody(DeclarationKind.Mixin, {) + endClassOrMixinOrExtensionBody(DeclarationKind.Mixin, 0, {, }) + endMixinDeclaration(mixin, }) + endTopLevelDeclaration(mixin) + beginMetadataStar(mixin) + endMetadataStar(0) + beginClassOrMixinOrNamedMixinApplicationPrelude(class) + handleIdentifier(C, classOrMixinDeclaration) + handleNoTypeVariables(=) + beginNamedMixinApplication(class, null, null, null, null, null, mixin, C) + handleIdentifier(Object, typeReference) + handleNoTypeArguments(with) + handleType(Object, null) + beginTypeList(M) + handleIdentifier(M, typeReference) + handleNoTypeArguments(;) + handleType(M, null) + endTypeList(1) + handleNamedMixinApplicationWithClause(with) + endNamedMixinApplication(class, class, =, null, ;) + endTopLevelDeclaration() +endCompilationUnit(4, ) diff --git a/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.intertwined.expect b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.intertwined.expect new file mode 100644 index 00000000000..fb30f2c73db --- /dev/null +++ b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.intertwined.expect @@ -0,0 +1,109 @@ +parseUnit(mixin) + skipErrorTokens(mixin) + listener: beginCompilationUnit(mixin) + syntheticPreviousToken(mixin) + parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext') + parseMetadataStar() + listener: beginMetadataStar(mixin) + listener: endMetadataStar(0) + parseTopLevelKeywordDeclaration(, mixin, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, mixin, class) + listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) + ensureIdentifier(class, classOrMixinDeclaration) + listener: handleIdentifier(A, classOrMixinDeclaration) + listener: handleNoTypeVariables({) + listener: beginClassDeclaration(class, null, null, null, null, null, mixin, A) + parseClass(A, class, class, A) + parseClassHeaderOpt(A, class, class) + parseClassExtendsOpt(A) + listener: handleNoType(A) + listener: handleClassExtends(null, 1) + parseClassWithClauseOpt(A) + listener: handleClassNoWithClause() + parseClassOrMixinOrEnumImplementsOpt(A) + listener: handleImplements(null, 0) + listener: handleClassHeader(class, class, null) + parseClassOrMixinOrExtensionBody(A, DeclarationKind.Class, A) + listener: beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) + notEofOrValue(}, }) + listener: endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) + listener: endClassDeclaration(class, }) + listener: endTopLevelDeclaration(abstract) + parseTopLevelDeclarationImpl(}, Instance of 'DirectiveContext') + parseMetadataStar(}) + listener: beginMetadataStar(abstract) + listener: endMetadataStar(0) + parseTopLevelKeywordDeclaration(}, mixin, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, 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, mixin, B) + parseClass(B, abstract, class, B) + parseClassHeaderOpt(B, abstract, class) + parseClassExtendsOpt(B) + listener: handleNoType(B) + listener: handleClassExtends(null, 1) + parseClassWithClauseOpt(B) + listener: handleClassNoWithClause() + parseClassOrMixinOrEnumImplementsOpt(B) + listener: handleImplements(null, 0) + listener: handleClassHeader(abstract, class, null) + parseClassOrMixinOrExtensionBody(B, DeclarationKind.Class, B) + listener: beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) + notEofOrValue(}, }) + listener: endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) + listener: endClassDeclaration(abstract, }) + listener: endTopLevelDeclaration(mixin) + parseTopLevelDeclarationImpl(}, Instance of 'DirectiveContext') + parseMetadataStar(}) + listener: beginMetadataStar(mixin) + listener: endMetadataStar(0) + parseTopLevelKeywordDeclaration(}, mixin, null, null, null, Instance of 'DirectiveContext') + parseMixin(null, null, mixin) + listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) + ensureIdentifier(mixin, classOrMixinDeclaration) + listener: handleIdentifier(M, classOrMixinDeclaration) + listener: handleNoTypeVariables({) + listener: beginMixinDeclaration(null, null, mixin, M) + parseMixinHeaderOpt(M, mixin) + parseMixinOnOpt(M) + listener: handleMixinOn(null, 0) + parseClassOrMixinOrEnumImplementsOpt(M) + listener: handleImplements(null, 0) + listener: handleMixinHeader(mixin) + parseClassOrMixinOrExtensionBody(M, DeclarationKind.Mixin, M) + listener: beginClassOrMixinOrExtensionBody(DeclarationKind.Mixin, {) + notEofOrValue(}, }) + listener: endClassOrMixinOrExtensionBody(DeclarationKind.Mixin, 0, {, }) + listener: endMixinDeclaration(mixin, }) + listener: endTopLevelDeclaration(mixin) + parseTopLevelDeclarationImpl(}, Instance of 'DirectiveContext') + parseMetadataStar(}) + listener: beginMetadataStar(mixin) + listener: endMetadataStar(0) + parseTopLevelKeywordDeclaration(}, mixin, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, mixin, class) + listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) + ensureIdentifier(class, classOrMixinDeclaration) + listener: handleIdentifier(C, classOrMixinDeclaration) + listener: handleNoTypeVariables(=) + listener: beginNamedMixinApplication(class, null, null, null, null, null, mixin, C) + parseNamedMixinApplication(C, class, class) + listener: handleIdentifier(Object, typeReference) + listener: handleNoTypeArguments(with) + listener: handleType(Object, null) + parseMixinApplicationRest(Object) + parseTypeList(with) + listener: beginTypeList(M) + listener: handleIdentifier(M, typeReference) + listener: handleNoTypeArguments(;) + listener: handleType(M, null) + listener: endTypeList(1) + listener: handleNamedMixinApplicationWithClause(with) + ensureSemicolon(M) + listener: endNamedMixinApplication(class, class, =, null, ;) + listener: endTopLevelDeclaration() + reportAllErrorTokens(mixin) + listener: endCompilationUnit(4, ) diff --git a/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.parser.expect b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.parser.expect new file mode 100644 index 00000000000..56eaa47e141 --- /dev/null +++ b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.parser.expect @@ -0,0 +1,15 @@ +mixin class A {} + +abstract mixin class B {} + +mixin M {} +mixin class C = Object with M; + + +mixin[KeywordToken] class[KeywordToken] A[StringToken] {[BeginToken]}[SimpleToken] + +abstract[KeywordToken] mixin[KeywordToken] class[KeywordToken] B[StringToken] {[BeginToken]}[SimpleToken] + +mixin[KeywordToken] M[StringToken] {[BeginToken]}[SimpleToken] +mixin[KeywordToken] class[KeywordToken] C[StringToken] =[SimpleToken] Object[StringToken] with[KeywordToken] M[StringToken];[SimpleToken] +[SimpleToken] diff --git a/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.scanner.expect b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.scanner.expect new file mode 100644 index 00000000000..56eaa47e141 --- /dev/null +++ b/pkg/front_end/parser_testcases/mixin_class/mixin_class.dart.scanner.expect @@ -0,0 +1,15 @@ +mixin class A {} + +abstract mixin class B {} + +mixin M {} +mixin class C = Object with M; + + +mixin[KeywordToken] class[KeywordToken] A[StringToken] {[BeginToken]}[SimpleToken] + +abstract[KeywordToken] mixin[KeywordToken] class[KeywordToken] B[StringToken] {[BeginToken]}[SimpleToken] + +mixin[KeywordToken] M[StringToken] {[BeginToken]}[SimpleToken] +mixin[KeywordToken] class[KeywordToken] C[StringToken] =[SimpleToken] Object[StringToken] with[KeywordToken] M[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 fd31dfa221e..74088e12d8f 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, C) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -170,7 +170,7 @@ beginCompilationUnit(abstract) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, null, Bar) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.intertwined.expect index 9a8dd4a6da9..28ec9ff478a 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 @@ -7,12 +7,12 @@ parseUnit(abstract) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) + parseClassOrNamedMixinApplication(abstract, 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, C) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, C) parseClass(C, abstract, class, C) parseClassHeaderOpt(C, abstract, class) parseClassExtendsOpt(C) @@ -198,12 +198,12 @@ parseUnit(abstract) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) + parseClassOrNamedMixinApplication(abstract, 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, Bar) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, Bar) parseClass(Bar, abstract, class, Bar) parseClassHeaderOpt(Bar, abstract, class) parseClassExtendsOpt(Bar) diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.expect index 55d6f795e0c..3f84f3d3cf0 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.intertwined.expect index 059bb775dbf..9cf00ee36b1 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 @@ -43,12 +43,12 @@ parseUnit(final) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect index 28c9201639a..875e52f7c9c 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect index b3436faf7fe..1c3aa71058e 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 @@ -74,12 +74,12 @@ parseUnit(void) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect index 71e3995e7f4..80004bc338e 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect index f209ebd0b3f..9bca25e8658 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect index 0d2d8666cef..94f6b6f5de2 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, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect index a77cb8be0b4..ae09531ec18 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.expect index 0eaf5d94858..aafb208a449 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, X) + beginClassDeclaration(class, null, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect index 413d8e0aa28..d43ebafa4d5 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.expect index ce1c0117971..cfe064a9b65 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, X) + beginClassDeclaration(class, null, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect index 0d8ca1be7d6..cecf005e3d1 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.expect index 46e7d6c83d9..37edecc93e5 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect index 218954e7700..f1452b15556 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.expect index 7fa99293583..8caa4f39fa3 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect index 33975114802..f82a6c75f09 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.expect index 694bb8ebb07..0ab8c0be4b2 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect index aaf7ef0d051..402af0bd160 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect index d8fdb2c014a..90a801ed554 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect index 76c7c1357ef..a0c374a8a19 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect index b2d98d6e567..808377d526a 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect index f83443672c9..0c98843de05 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect index d4c081efa6c..4f0d97039b8 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect index 0a77e465964..1bba62b714b 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect index 01a40f21b29..8ee088c083d 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect @@ -72,7 +72,7 @@ beginCompilationUnit(bool) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.intertwined.expect index 1842e16cf0d..d183c996511 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 @@ -187,12 +187,12 @@ parseUnit(bool) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect index 26a042c06d1..1b85c8c43c5 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect @@ -309,7 +309,7 @@ beginCompilationUnit(Order) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Order, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Order) + beginClassDeclaration(class, null, null, null, null, null, null, Order) handleNoType(Order) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.intertwined.expect index 751302f6866..62b113229d3 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 @@ -634,12 +634,12 @@ parseUnit(Order) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Order) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Order) parseClass(Order, class, class, Order) parseClassHeaderOpt(Order, class, class) parseClassExtendsOpt(Order) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect index e361ab1b345..5e8711d12f6 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect index 699f7db1a6f..dbd47eb9743 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect index a43819127b3..f8960862933 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect index 50422b9622b..e23e6551718 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect index 9bcbe7eef11..8142bb054d8 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect index a35d404dbdd..260f9bf10ea 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect b/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect index 64b49630b35..3ca65a32018 100644 --- a/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect @@ -123,7 +123,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -161,7 +161,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect index 1592e1bf040..eef6a00a871 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 @@ -326,12 +326,12 @@ parseUnit(main) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -417,12 +417,12 @@ parseUnit(main) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect index 6c8397acddc..eb01c209e7f 100644 --- a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect @@ -141,7 +141,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -179,7 +179,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect index 41f0ea6b69d..55f7b8196fa 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 @@ -375,12 +375,12 @@ parseUnit(main) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -466,12 +466,12 @@ parseUnit(main) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect index 990f55d620a..5813bb7cc5d 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, Class1) + beginClassDeclaration(class, null, null, null, null, null, null, Class1) handleNoType(Class1) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect index 9c8c949da07..e851673e327 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Class1) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Class1) parseClass(Class1, class, class, Class1) parseClassHeaderOpt(Class1, class, class) parseClassExtendsOpt(Class1) diff --git a/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect b/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect index 583b0e8613c..009bc15c56e 100644 --- a/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect @@ -123,7 +123,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -161,7 +161,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect index 8f16f71ba71..9ce6622a5e0 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 @@ -326,12 +326,12 @@ parseUnit(main) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -417,12 +417,12 @@ parseUnit(main) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect index 6de6fcae5c5..7955937994a 100644 --- a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect @@ -134,7 +134,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -172,7 +172,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect index 547a36958fb..c1bf40bf067 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 @@ -342,12 +342,12 @@ parseUnit(main) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, X) + listener: beginClassDeclaration(class, null, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -433,12 +433,12 @@ parseUnit(main) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect index ab04444b95e..2b4a1577e8e 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect index 1eb1da8cdd5..5059574b3ba 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect index 4aafec4622b..86300c0bb80 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect index a14bb118494..2c21921133e 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect index 36b6afef5f6..a34e875687d 100644 --- a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect +++ b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect @@ -95,7 +95,7 @@ beginCompilationUnit(extension) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(abstract, abstract, null, null, null, null, Foo) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, Foo) handleIdentifier(List, typeReference) beginTypeArguments(<) handleIdentifier(List, typeReference) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect index 5983368345f..af9696f2d47 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 @@ -205,12 +205,12 @@ parseUnit(extension) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) + parseClassOrNamedMixinApplication(abstract, 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, Foo) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, Foo) parseClass(Foo, abstract, class, Foo) parseClassHeaderOpt(Foo, abstract, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect index 131c7a333e6..099e7395090 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(late, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, late) + beginClassDeclaration(class, null, null, null, null, null, null, late) handleNoType(late) handleClassExtends(null, 1) handleClassNoWithClause() @@ -35,7 +35,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(required, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, required) + beginClassDeclaration(class, null, null, null, null, null, null, required) handleNoType(required) handleClassExtends(null, 1) handleClassNoWithClause() @@ -66,7 +66,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect index 34a8f60f8a3..ed96cade555 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(late, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, late) + listener: beginClassDeclaration(class, null, null, null, null, null, null, late) parseClass(late, class, class, late) parseClassHeaderOpt(late, class, class) parseClassExtendsOpt(late) @@ -71,12 +71,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(null, null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(required, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null, required) + listener: beginClassDeclaration(class, null, null, null, null, null, null, required) parseClass(required, class, class, required) parseClassHeaderOpt(required, class, class) parseClassExtendsOpt(required) @@ -135,12 +135,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect index 2edf6353125..fb9fce0ea2f 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Xlate, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Xlate) + beginClassDeclaration(class, null, null, null, null, null, null, Xlate) handleNoType(Xlate) handleClassExtends(null, 1) handleClassNoWithClause() @@ -35,7 +35,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Xrequired, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Xrequired) + beginClassDeclaration(class, null, null, null, null, null, null, Xrequired) handleNoType(Xrequired) handleClassExtends(null, 1) handleClassNoWithClause() @@ -66,7 +66,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect index a70d4abdbdc..35c7f236734 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Xlate) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Xlate) parseClass(Xlate, class, class, Xlate) parseClassHeaderOpt(Xlate, class, class) parseClassExtendsOpt(Xlate) @@ -71,12 +71,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Xrequired) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Xrequired) parseClass(Xrequired, class, class, Xrequired) parseClassHeaderOpt(Xrequired, class, class) parseClassExtendsOpt(Xrequired) @@ -135,12 +135,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.expect index 9aa9206ddc5..3f452b334e2 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.expect @@ -12,7 +12,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, null, A) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() @@ -27,7 +27,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables(implements) - beginClassDeclaration(class, null, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.intertwined.expect index 4f3a14198bd..aac28bfc3af 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.intertwined.expect @@ -7,7 +7,7 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, A) + listener: beginClassDeclaration(class, null, null, null, null, null, null, A) parseClass(>, class, class, A) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) @@ -42,12 +42,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, B) + listener: beginClassDeclaration(class, null, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.expect index 6e362aa98f6..717b8d26bf1 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.expect @@ -246,7 +246,7 @@ beginCompilationUnit(int) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.intertwined.expect index 9f4528ed856..eced69f6206 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.intertwined.expect @@ -336,12 +336,12 @@ parseUnit(int) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect index 40e45c477b2..e1917d0cfcd 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect @@ -125,7 +125,7 @@ beginCompilationUnit(void) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect index 4b95f3f5ae7..78b807fb86d 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect @@ -254,12 +254,12 @@ parseUnit(void) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect index f8a0232fb6f..8d7084dac57 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect index e6c40fe4bc2..327e674479f 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect index 98711245871..f048218d791 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect index b37c4650847..69a5d2220eb 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect index 0d16782c3b1..6f625239e2a 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect index 5dafd3fdb6b..94aee25ed10 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect index a06b4c2f087..a412166167e 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect index 91d15db0715..ef517f0c493 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect index 8236003673a..03cc96e222f 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect index 6a5a19a4088..e7d63587fa8 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect index 51cd70407c3..2a35cf4a611 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect index 8ca26ce4c06..a8c0784ac5f 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 @@ -7,7 +7,7 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(>, class, class, C) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect index 93999ca8b4a..816831047d2 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect index fdf7e2784db..af38c18fa9b 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 @@ -7,7 +7,7 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(>, class, class, C) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect index d38edc0c08c..472e8cc0b78 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect index 7f82ff448f7..1d39be8ed5b 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect index bf9caa7f249..6eb9c3727a5 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect index 4aaea540f13..c879b75a0eb 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect index 1b09429456f..409452e7933 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect index 43584a93f87..97b6b39c0b7 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect index f70fe792be2..e544485607b 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect index 7ff83df33b9..8c1e0f29122 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.expect b/pkg/front_end/parser_testcases/patterns/object_unprefixed_withTypeArgs_insideDeclaration.dart.expect index f9bab8179d4..1f2f5859feb 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() 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 505a32f4e11..f340eb8903a 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 @@ -7,7 +7,7 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(>, class, class, C) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) 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 e7aef90c6e3..1cdc38620ac 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect index 381db964cd8..47df590522d 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect index 925258ea78b..9365f017655 100644 --- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect index 274873856fc..06d0c32f620 100644 --- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect index 34d0911a384..e81ac013720 100644 --- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect index 953c119b04a..dc3e0422d74 100644 --- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect index ea37b48b0ac..b111562618b 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, C) + beginClassDeclaration(class, null, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect index b2c47580977..062afbe653d 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, C) + listener: beginClassDeclaration(class, null, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.expect b/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.expect index e1054d33682..232dedc99cd 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, Foo) + beginClassDeclaration(abstract, abstract, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.intertwined.expect index fadbff87211..ef992ab2bb3 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 @@ -7,12 +7,12 @@ parseUnit(abstract) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) + parseClassOrNamedMixinApplication(abstract, 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, Foo) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, null, Foo) parseClass(Foo, abstract, class, Foo) parseClassHeaderOpt(Foo, abstract, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect index 86521d7da53..cc98faddf92 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() @@ -66,7 +66,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect index 3f607d73f86..73e67a114f7 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) @@ -127,12 +127,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, Bar) parseClassHeaderOpt(Bar, class, class) parseClassExtendsOpt(Bar) diff --git a/pkg/front_end/parser_testcases/record/record_type_03.dart.expect b/pkg/front_end/parser_testcases/record/record_type_03.dart.expect index 1eaeebf1146..70c52297327 100644 --- a/pkg/front_end/parser_testcases/record/record_type_03.dart.expect +++ b/pkg/front_end/parser_testcases/record/record_type_03.dart.expect @@ -179,7 +179,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Baz, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Baz) + beginClassDeclaration(class, null, null, null, null, null, null, Baz) handleNoType(Baz) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect index 991e2d6e66f..0d541437777 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 @@ -377,12 +377,12 @@ parseUnit(() listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Baz) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Baz) parseClass(Baz, class, class, Baz) parseClassHeaderOpt(Baz, class, class) parseClassExtendsOpt(Baz) diff --git a/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect b/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect index 769fe445997..7520d9286fb 100644 --- a/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect +++ b/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect @@ -897,7 +897,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1834,7 +1834,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect index 3e5cec4b475..53bf41b72db 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 @@ -1738,12 +1738,12 @@ parseUnit(() listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) @@ -3599,12 +3599,12 @@ parseUnit(() listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, Bar) parseClassHeaderOpt(Bar, class, class) parseClassExtendsOpt(Bar) diff --git a/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect b/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect index e1a2e4374e8..ac7da9143a2 100644 --- a/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect +++ b/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect @@ -166,7 +166,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() @@ -347,7 +347,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect index eb3f615acf9..be87e5135fd 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 @@ -336,12 +336,12 @@ parseUnit(() listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) @@ -709,12 +709,12 @@ parseUnit(() listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Bar) parseClass(Bar, class, class, Bar) parseClassHeaderOpt(Bar, class, class) parseClassExtendsOpt(Bar) diff --git a/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.expect b/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.expect index 358b3e4bb6a..22f7ee710ec 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.intertwined.expect index 840f9b7bf21..e4c5098e58d 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect index 0d89b240ba5..9f779a11c20 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, Foo) + beginClassDeclaration(class, null, null, null, null, null, null, Foo) handleIdentifier(Bar, typeReference) handleNoTypeArguments({) handleType(Bar, null) diff --git a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect index 9eb0c6ed403..b48e449a833 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 @@ -7,12 +7,12 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, null, class) + parseClassOrNamedMixinApplication(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, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.expect b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.expect index 81a62b2b3cd..5565f649f49 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(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, sealed, null, Class) + beginClassDeclaration(class, null, null, null, sealed, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -32,7 +32,7 @@ beginCompilationUnit(sealed) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables(=) - beginNamedMixinApplication(class, null, null, null, sealed, null, A) + beginNamedMixinApplication(class, null, null, null, sealed, 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 46ca24c2cb3..755ca794747 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 @@ -7,12 +7,12 @@ parseUnit(sealed) listener: beginMetadataStar(sealed) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(, class, null, null, sealed, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, sealed, null, class) + parseClassOrNamedMixinApplication(null, null, null, sealed, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, sealed, null, Class) + listener: beginClassDeclaration(class, null, null, null, sealed, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -57,12 +57,12 @@ parseUnit(sealed) listener: beginMetadataStar(sealed) listener: endMetadataStar(0) parseTopLevelKeywordDeclaration(}, class, null, null, sealed, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, sealed, null, class) + parseClassOrNamedMixinApplication(null, null, null, sealed, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables(=) - listener: beginNamedMixinApplication(class, null, null, null, sealed, null, A) + listener: beginNamedMixinApplication(class, null, null, null, sealed, null, null, A) parseNamedMixinApplication(A, class, class) listener: handleIdentifier(Object, typeReference) listener: handleNoTypeArguments(with) diff --git a/pkg/front_end/test/parser_test_listener.dart b/pkg/front_end/test/parser_test_listener.dart index 1d4798a5f84..2cc11a8a5e8 100644 --- a/pkg/front_end/test/parser_test_listener.dart +++ b/pkg/front_end/test/parser_test_listener.dart @@ -217,6 +217,7 @@ class ParserTestListener implements Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { seen(begin); seen(abstractToken); @@ -224,6 +225,7 @@ class ParserTestListener implements Listener { seen(inlineToken); seen(sealedToken); seen(augmentToken); + seen(mixinToken); seen(name); doPrint('beginClassDeclaration(' '$begin, ' @@ -232,6 +234,7 @@ class ParserTestListener implements Listener { '$inlineToken, ' '$sealedToken, ' '$augmentToken, ' + '$mixinToken, ' '$name)'); indent++; } @@ -1083,6 +1086,7 @@ class ParserTestListener implements Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { seen(begin); seen(abstractToken); @@ -1090,6 +1094,7 @@ class ParserTestListener implements Listener { seen(inlineToken); seen(sealedToken); seen(augmentToken); + seen(mixinToken); seen(name); doPrint('beginNamedMixinApplication(' '$begin, ' @@ -1098,6 +1103,7 @@ class ParserTestListener implements Listener { '$inlineToken, ' '$sealedToken, ' '$augmentToken, ' + '$mixinToken, ' '$name)'); indent++; } diff --git a/pkg/front_end/test/parser_test_listener_creator.dart b/pkg/front_end/test/parser_test_listener_creator.dart index d3f3fb069b0..01ee79ef4ac 100644 --- a/pkg/front_end/test/parser_test_listener_creator.dart +++ b/pkg/front_end/test/parser_test_listener_creator.dart @@ -135,6 +135,7 @@ class ParserCreatorListener extends Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { if (name.lexeme == "Listener") insideListenerClass = true; } diff --git a/pkg/front_end/test/parser_test_parser.dart b/pkg/front_end/test/parser_test_parser.dart index 1e15e5c1785..52d325b8057 100644 --- a/pkg/front_end/test/parser_test_parser.dart +++ b/pkg/front_end/test/parser_test_parser.dart @@ -656,6 +656,7 @@ class TestParser extends Parser { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token classKeyword) { doPrint('parseClassOrNamedMixinApplication(' '$abstractToken, ' @@ -663,10 +664,17 @@ class TestParser extends Parser { '$inlineToken, ' '$sealedToken, ' '$augmentToken, ' + '$mixinToken, ' '$classKeyword)'); indent++; - var result = super.parseClassOrNamedMixinApplication(abstractToken, - macroToken, inlineToken, sealedToken, augmentToken, classKeyword); + var result = super.parseClassOrNamedMixinApplication( + abstractToken, + macroToken, + inlineToken, + sealedToken, + augmentToken, + mixinToken, + classKeyword); indent--; return result; } diff --git a/pkg/front_end/test/parser_test_parser_creator.dart b/pkg/front_end/test/parser_test_parser_creator.dart index e4de5ac4a3d..17026863972 100644 --- a/pkg/front_end/test/parser_test_parser_creator.dart +++ b/pkg/front_end/test/parser_test_parser_creator.dart @@ -133,6 +133,7 @@ class ParserCreatorListener extends Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { if (name.lexeme == "Parser") insideParserClass = true; } diff --git a/pkg/front_end/testcases/general/mixin_class_declaration.dart b/pkg/front_end/testcases/general/mixin_class_declaration.dart new file mode 100644 index 00000000000..d2079356bf5 --- /dev/null +++ b/pkg/front_end/testcases/general/mixin_class_declaration.dart @@ -0,0 +1,10 @@ +// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +mixin class A {} + +abstract mixin class B {} + +mixin M {} +mixin class C = Object with M; diff --git a/pkg/front_end/testcases/general/mixin_class_declaration.dart.textual_outline.expect b/pkg/front_end/testcases/general/mixin_class_declaration.dart.textual_outline.expect new file mode 100644 index 00000000000..9f2fcbf499e --- /dev/null +++ b/pkg/front_end/testcases/general/mixin_class_declaration.dart.textual_outline.expect @@ -0,0 +1,6 @@ +mixin +class A {} +abstract mixin class B {} +mixin M {} +mixin +class C = Object with M; diff --git a/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.expect b/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.expect new file mode 100644 index 00000000000..601dfcfc883 --- /dev/null +++ b/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.expect @@ -0,0 +1,39 @@ +library /*isNonNullableByDefault*/; +// +// Problems in library: +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:5:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// mixin class A {} +// ^^^^^ +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:7:10: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// abstract mixin class B {} +// ^^^^^ +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:10:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// mixin class C = Object with M; +// ^^^^^ +// +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + : super core::Object::•() + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C = core::Object with self::M /*hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.modular.expect b/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.modular.expect new file mode 100644 index 00000000000..601dfcfc883 --- /dev/null +++ b/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.modular.expect @@ -0,0 +1,39 @@ +library /*isNonNullableByDefault*/; +// +// Problems in library: +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:5:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// mixin class A {} +// ^^^^^ +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:7:10: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// abstract mixin class B {} +// ^^^^^ +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:10:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// mixin class C = Object with M; +// ^^^^^ +// +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + : super core::Object::•() + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C = core::Object with self::M /*hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.outline.expect b/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.outline.expect new file mode 100644 index 00000000000..849484a13ed --- /dev/null +++ b/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.outline.expect @@ -0,0 +1,37 @@ +library /*isNonNullableByDefault*/; +// +// Problems in library: +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:5:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// mixin class A {} +// ^^^^^ +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:7:10: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// abstract mixin class B {} +// ^^^^^ +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:10:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// mixin class C = Object with M; +// ^^^^^ +// +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C = core::Object with self::M /*hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.transformed.expect b/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.transformed.expect new file mode 100644 index 00000000000..3d73586a30f --- /dev/null +++ b/pkg/front_end/testcases/general/mixin_class_declaration.dart.weak.transformed.expect @@ -0,0 +1,39 @@ +library /*isNonNullableByDefault*/; +// +// Problems in library: +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:5:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// mixin class A {} +// ^^^^^ +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:7:10: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// abstract mixin class B {} +// ^^^^^ +// +// pkg/front_end/testcases/general/mixin_class_declaration.dart:10:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// mixin class C = Object with M; +// ^^^^^ +// +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + : super core::Object::•() + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C extends core::Object implements self::M /*isEliminatedMixin,hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/mixin_class/folder.options b/pkg/front_end/testcases/mixin_class/folder.options new file mode 100644 index 00000000000..cd0d34f2de7 --- /dev/null +++ b/pkg/front_end/testcases/mixin_class/folder.options @@ -0,0 +1 @@ +--enable-experiment=sealed-class \ No newline at end of file diff --git a/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart new file mode 100644 index 00000000000..d2079356bf5 --- /dev/null +++ b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart @@ -0,0 +1,10 @@ +// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +mixin class A {} + +abstract mixin class B {} + +mixin M {} +mixin class C = Object with M; diff --git a/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.strong.expect b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.strong.expect new file mode 100644 index 00000000000..2a760630b76 --- /dev/null +++ b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.strong.expect @@ -0,0 +1,21 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + : super core::Object::•() + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C = core::Object with self::M /*hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.strong.transformed.expect b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.strong.transformed.expect new file mode 100644 index 00000000000..3e3e810054c --- /dev/null +++ b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.strong.transformed.expect @@ -0,0 +1,21 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + : super core::Object::•() + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C extends core::Object implements self::M /*isEliminatedMixin,hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.textual_outline.expect b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.textual_outline.expect new file mode 100644 index 00000000000..9f2fcbf499e --- /dev/null +++ b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.textual_outline.expect @@ -0,0 +1,6 @@ +mixin +class A {} +abstract mixin class B {} +mixin M {} +mixin +class C = Object with M; diff --git a/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.expect b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.expect new file mode 100644 index 00000000000..2a760630b76 --- /dev/null +++ b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.expect @@ -0,0 +1,21 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + : super core::Object::•() + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C = core::Object with self::M /*hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.modular.expect b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.modular.expect new file mode 100644 index 00000000000..2a760630b76 --- /dev/null +++ b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.modular.expect @@ -0,0 +1,21 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + : super core::Object::•() + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C = core::Object with self::M /*hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.outline.expect b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.outline.expect new file mode 100644 index 00000000000..76f8cc4bbf3 --- /dev/null +++ b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.outline.expect @@ -0,0 +1,19 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C = core::Object with self::M /*hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.transformed.expect b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.transformed.expect new file mode 100644 index 00000000000..3e3e810054c --- /dev/null +++ b/pkg/front_end/testcases/mixin_class/mixin_class_declaration.dart.weak.transformed.expect @@ -0,0 +1,21 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} +abstract class B extends core::Object { + synthetic constructor •() → self::B + : super core::Object::•() + ; +} +abstract class M extends core::Object /*isMixinDeclaration*/ { +} +class C extends core::Object implements self::M /*isEliminatedMixin,hasConstConstructor*/ { + const synthetic constructor •() → self::C + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/textual_outline.status b/pkg/front_end/testcases/textual_outline.status index 6a56358272e..3e6ab826000 100644 --- a/pkg/front_end/testcases/textual_outline.status +++ b/pkg/front_end/testcases/textual_outline.status @@ -104,6 +104,7 @@ general/macro_class: FormatterCrash general/many_errors2: FormatterCrash general/many_errors: FormatterCrash general/missing_prefix_name: FormatterCrash +general/mixin_class_declaration: FormatterCrash general/new_as_selector: FormatterCrash general/null_aware_super: FormatterCrash general/null_safety_invalid_experiment: FormatterCrash @@ -131,6 +132,7 @@ macros/macro_class: FormatterCrash macros/multiple_augment_class: FormatterCrash macros/multiple_imports: FormatterCrash macros/scope_access: FormatterCrash +mixin_class/mixin_class_declaration: FormatterCrash nnbd/abstract_field_errors: FormatterCrash nnbd/duplicates_instance_extension: FormatterCrash nnbd/field_vs_setter: FormatterCrash diff --git a/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart b/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart index 4dff434823f..cb05a43666c 100644 --- a/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart +++ b/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart @@ -112,6 +112,7 @@ class ParserCreatorListener extends Listener { Token? inlineToken, Token? sealedToken, Token? augmentToken, + Token? mixinToken, Token name) { if (name.lexeme == "Listener") insideListenerClass = true; } diff --git a/tests/language/mixin_class/mixin_class_syntax_disabled_error_test.dart b/tests/language/mixin_class/mixin_class_syntax_disabled_error_test.dart new file mode 100644 index 00000000000..aa0ef938b92 --- /dev/null +++ b/tests/language/mixin_class/mixin_class_syntax_disabled_error_test.dart @@ -0,0 +1,22 @@ +// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +// Make sure errors are emitted when trying to use mixin classes without +// the `sealed` experiment enabled. + +mixin class MixinClass {} +// [error column 1, length 5] +// [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED +// [cfe] This requires the experimental 'sealed-class' language feature to be enabled. + +abstract mixin class AbstractMixinClass {} +// ^^^^^ +// [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED +// [cfe] This requires the experimental 'sealed-class' language feature to be enabled. + +mixin M {} +mixin class NamedMixinClassApplication = Object with M; +// [error column 1, length 5] +// [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED +// [cfe] This requires the experimental 'sealed-class' language feature to be enabled. \ No newline at end of file