From 599911d1970a866d88588378dbc71c828cca7f11 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Thu, 1 Dec 2022 21:49:47 +0000 Subject: [PATCH] Add parser support for `for (var pattern = expression; ...; ...)` Bug: https://github.com/dart-lang/sdk/issues/50035 Change-Id: I5f07b848ba06be403e56538a4cc64f6de51bd668 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/273005 Reviewed-by: Konstantin Shcheglov Commit-Queue: Paul Berry --- .../lib/src/parser/forwarding_listener.dart | 6 + .../lib/src/parser/listener.dart | 11 +- .../src/parser/literal_entry_info_impl.dart | 19 +- .../lib/src/parser/parser_impl.dart | 114 ++--- pkg/analyzer/lib/src/dart/ast/ast.dart | 5 +- pkg/analyzer/lib/src/fasta/ast_builder.dart | 22 + .../test/generated/patterns_parser_test.dart | 69 +++ .../src/summary/resolved_ast_printer.dart | 16 + .../fasta/kernel/macro/annotation_parser.dart | 6 + .../lib/src/fasta/util/parser_ast_helper.dart | 24 ++ .../augment_super.dart.intertwined.expect | 56 +-- ...racket_mismatch_00.dart.intertwined.expect | 8 +- ...racket_mismatch_02.dart.intertwined.expect | 4 +- ...racket_mismatch_03.dart.intertwined.expect | 6 +- ...racket_mismatch_04.dart.intertwined.expect | 8 +- ...racket_mismatch_05.dart.intertwined.expect | 4 +- ...racket_mismatch_06.dart.intertwined.expect | 4 +- ...n_ascii_identifier.dart.intertwined.expect | 12 +- .../empty_await_for.dart.intertwined.expect | 6 +- .../empty_for.dart.intertwined.expect | 6 +- ...or_test_completion.dart.intertwined.expect | 8 +- .../for_in_with_colon.dart.intertwined.expect | 8 +- .../issue_000032.dart.intertwined.expect | 2 +- .../issue_26810.dart.intertwined.expect | 18 +- .../issue_26810_and.dart.intertwined.expect | 18 +- .../issue_26810_or.dart.intertwined.expect | 18 +- .../issue_38415.crash_dart.intertwined.expect | 2 +- .../issue_39058.crash_dart.intertwined.expect | 4 +- ..._39058_prime.crash_dart.intertwined.expect | 4 +- .../issue_39060.dart.intertwined.expect | 6 +- .../issue_42267.dart.intertwined.expect | 12 +- .../issue_45327.crash_dart.intertwined.expect | 2 +- ...5327_prime_1.crash_dart.intertwined.expect | 2 +- .../issue_48288.dart.intertwined.expect | 2 +- .../issue_48288_prime.dart.intertwined.expect | 2 +- ...issue_48371_prime3.dart.intertwined.expect | 2 +- .../issue_48380_4.dart.intertwined.expect | 2 +- .../issue_49116.dart.intertwined.expect | 62 +-- ...amed_class_methods.dart.intertwined.expect | 88 ++-- ..._top_level_methods.dart.intertwined.expect | 88 ++-- .../symbols.dart.intertwined.expect | 396 +++++++++--------- ...6_le_content.crash_dart.intertwined.expect | 6 +- .../assignment.dart.intertwined.expect | 2 +- .../augment_super.dart.intertwined.expect | 80 ++-- ...on_after_try_block.dart.intertwined.expect | 4 +- ...n_after_try_block2.dart.intertwined.expect | 8 +- ...r_try_block2_prime.dart.intertwined.expect | 4 +- ...n_after_try_block3.dart.intertwined.expect | 4 +- ...r_try_block3_prime.dart.intertwined.expect | 2 +- ...n_after_try_block4.dart.intertwined.expect | 4 +- ...r_try_block4_prime.dart.intertwined.expect | 2 +- ...n_after_try_block5.dart.intertwined.expect | 4 +- ...r_try_block5_prime.dart.intertwined.expect | 2 +- ...er_try_block_prime.dart.intertwined.expect | 2 +- .../chained_call_01.dart.intertwined.expect | 2 +- .../chained_call_02.dart.intertwined.expect | 2 +- .../chained_call_03.dart.intertwined.expect | 2 +- .../chained_call_04.dart.intertwined.expect | 2 +- .../chained_call_05.dart.intertwined.expect | 4 +- .../chained_call_06.dart.intertwined.expect | 4 +- .../chained_call_07.dart.intertwined.expect | 2 +- .../general/for.dart.intertwined.expect | 6 +- .../general/for_in.dart.intertwined.expect | 6 +- .../for_in_no_decl.dart.intertwined.expect | 8 +- .../for_no_decl.dart.intertwined.expect | 8 +- ...nction_declaration.dart.intertwined.expect | 2 +- ...unction_expression.dart.intertwined.expect | 4 +- .../issue_45120.dart.intertwined.expect | 4 +- .../issue_45703.dart.intertwined.expect | 8 +- .../issue_45848_01.dart.intertwined.expect | 6 +- ...sue_45848_01_prime.dart.intertwined.expect | 6 +- .../issue_45848_02.dart.intertwined.expect | 6 +- ...sue_45848_02_prime.dart.intertwined.expect | 6 +- .../issue_45848_03.dart.intertwined.expect | 6 +- ...sue_45848_03_prime.dart.intertwined.expect | 6 +- .../issue_45848_04.dart.intertwined.expect | 2 +- ...sue_45848_04_prime.dart.intertwined.expect | 2 +- .../issue_45848_05.dart.intertwined.expect | 10 +- .../issue_45848_06.dart.intertwined.expect | 6 +- .../issue_45848_07.dart.intertwined.expect | 6 +- .../issue_47008_01.dart.intertwined.expect | 2 +- .../issue_47008_02.dart.intertwined.expect | 2 +- .../issue_47009_01.dart.intertwined.expect | 2 +- .../issue_47009_02.dart.intertwined.expect | 2 +- .../issue_47009_03.dart.intertwined.expect | 2 +- ...issing_end_bracket.dart.intertwined.expect | 2 +- ...vel_get_called_get.dart.intertwined.expect | 16 +- .../chained_call_01.dart.intertwined.expect | 2 +- .../chained_call_02.dart.intertwined.expect | 2 +- .../chained_call_03.dart.intertwined.expect | 2 +- .../chained_call_04.dart.intertwined.expect | 2 +- .../chained_call_05.dart.intertwined.expect | 8 +- .../chained_call_06.dart.intertwined.expect | 8 +- .../chained_call_07.dart.intertwined.expect | 2 +- .../chained_call_08.dart.intertwined.expect | 2 +- ...with_index_01.dart.dart.intertwined.expect | 4 +- ...te_without_var_etc.dart.intertwined.expect | 12 +- .../nnbd/issue_39286.dart.intertwined.expect | 2 +- .../issue_39286_2.dart.intertwined.expect | 2 +- ...ssue_39286_2_prime.dart.intertwined.expect | 2 +- .../issue_39286_prime.dart.intertwined.expect | 2 +- .../nnbd/issue_39326.dart.intertwined.expect | 8 +- .../nnbd/issue_39723.dart.intertwined.expect | 10 +- .../issue_39723_prime.dart.intertwined.expect | 18 +- .../nnbd/issue_39776.dart.intertwined.expect | 12 +- ...issue_39776_prime1.dart.intertwined.expect | 12 +- ...issue_39776_prime2.dart.intertwined.expect | 14 +- ...issue_39776_prime3.dart.intertwined.expect | 6 +- ...issue_39776_prime4.dart.intertwined.expect | 6 +- ...ssue_40267_case_01.dart.intertwined.expect | 2 +- ...ssue_40267_case_05.dart.intertwined.expect | 4 +- ..._40267_conditional.dart.intertwined.expect | 14 +- ...0267_conditional_2.dart.intertwined.expect | 2 +- ...40267_index_access.dart.intertwined.expect | 8 +- ...ue_40267_index_set.dart.intertwined.expect | 8 +- ..._40267_lookup_plus.dart.intertwined.expect | 2 +- ...7_lookup_plus_plus.dart.intertwined.expect | 2 +- ..._no_type_arguments.dart.intertwined.expect | 6 +- ...ith_type_arguments.dart.intertwined.expect | 6 +- ...7_plus_plus_lookup.dart.intertwined.expect | 4 +- .../nnbd/issue_40793.dart.intertwined.expect | 2 +- .../issue_40793_prime.dart.intertwined.expect | 2 +- ...issue_40793_prime2.dart.intertwined.expect | 2 +- ...issue_40793_prime3.dart.intertwined.expect | 2 +- ...issue_40793_prime4.dart.intertwined.expect | 2 +- ...issue_40793_prime5.dart.intertwined.expect | 2 +- .../issue_40834_03.dart.intertwined.expect | 4 +- .../nnbd/issue_41177.dart.intertwined.expect | 16 +- .../nnbd/issue_41597.dart.intertwined.expect | 6 +- .../nnbd/issue_47020.dart.intertwined.expect | 10 +- .../nnbd/issue_48999.dart.intertwined.expect | 8 +- .../issue_48999_prime.dart.intertwined.expect | 8 +- .../nnbd/issue_49678.dart.intertwined.expect | 8 +- .../issue_49678_prime.dart.intertwined.expect | 8 +- .../nnbd/late_member.dart.intertwined.expect | 24 +- .../late_modifier.dart.intertwined.expect | 30 +- ...llCheckBeforeIndex.dart.intertwined.expect | 2 +- ...eIndex_with_parens.dart.intertwined.expect | 4 +- .../nullCheckOnIndex.dart.intertwined.expect | 2 +- .../nullCheckOnIndex2.dart.intertwined.expect | 2 +- ...Index2_with_parens.dart.intertwined.expect | 4 +- .../nullCheckOnIndex3.dart.intertwined.expect | 2 +- ...Index3_with_parens.dart.intertwined.expect | 4 +- .../nullCheckOnIndex4.dart.intertwined.expect | 2 +- ...Index4_with_parens.dart.intertwined.expect | 4 +- .../nullCheckOnIndex5.dart.intertwined.expect | 2 +- ...Index5_with_parens.dart.intertwined.expect | 4 +- .../nullCheckOnIndex6.dart.intertwined.expect | 2 +- ...Index6_with_parens.dart.intertwined.expect | 4 +- ...nIndex_with_parens.dart.intertwined.expect | 4 +- ...ull_shorting_index.dart.intertwined.expect | 14 +- .../required_member.dart.intertwined.expect | 24 +- .../required_modifier.dart.intertwined.expect | 24 +- ...riple_shift_method.dart.intertwined.expect | 10 +- ...shift_method_prime.dart.intertwined.expect | 10 +- ...ge_of_triple_shift.dart.intertwined.expect | 4 +- ...t_not_triple_shift.dart.intertwined.expect | 2 +- ...riple_shift_symbol.dart.intertwined.expect | 2 +- .../issue_39326.dart.intertwined.expect | 4 +- ..._40267_conditional.dart.intertwined.expect | 14 +- ...0267_conditional_2.dart.intertwined.expect | 2 +- ...0267_conditional_3.dart.intertwined.expect | 2 +- ...e_late_in_non_nnbd.dart.intertwined.expect | 12 +- ...quired_in_non_nnbd.dart.intertwined.expect | 8 +- .../cast_inside_case.dart.intertwined.expect | 2 +- ...lyPrefixed_builtin.dart.intertwined.expect | 2 +- ...ixed_pseudoKeyword.dart.intertwined.expect | 2 +- ...tifier_inside_case.dart.intertwined.expect | 2 +- ...tifier_inside_cast.dart.intertwined.expect | 2 +- ...ier_inside_if_case.dart.intertwined.expect | 2 +- ...inside_null_assert.dart.intertwined.expect | 2 +- ..._inside_null_check.dart.intertwined.expect | 2 +- ...r_prefixed_builtin.dart.intertwined.expect | 2 +- ...ixed_pseudoKeyword.dart.intertwined.expect | 2 +- ...refixed_beforeWhen.dart.intertwined.expect | 2 +- ...unprefixed_builtin.dart.intertwined.expect | 2 +- ...ixed_pseudoKeyword.dart.intertwined.expect | 2 +- ...ffix_in_expression.dart.intertwined.expect | 4 +- ...ent_typed_nonEmpty.dart.intertwined.expect | 4 +- ...ment_untyped_empty.dart.intertwined.expect | 4 +- ...mptyWithWhitespace.dart.intertwined.expect | 4 +- ...t_untyped_nonEmpty.dart.intertwined.expect | 4 +- ...ion_typed_nonEmpty.dart.intertwined.expect | 2 +- ...tion_untyped_empty.dart.intertwined.expect | 2 +- ...mptyWithWhitespace.dart.intertwined.expect | 2 +- ...n_untyped_nonEmpty.dart.intertwined.expect | 2 +- ...ent_typed_nonEmpty.dart.intertwined.expect | 4 +- ...ment_untyped_empty.dart.intertwined.expect | 4 +- ...t_untyped_nonEmpty.dart.intertwined.expect | 4 +- ...ion_typed_nonEmpty.dart.intertwined.expect | 2 +- ...tion_untyped_empty.dart.intertwined.expect | 2 +- ...n_untyped_nonEmpty.dart.intertwined.expect | 2 +- ...assert_inside_case.dart.intertwined.expect | 2 +- ..._check_inside_case.dart.intertwined.expect | 2 +- ..._insideDeclaration.dart.intertwined.expect | 2 +- ...s_insideAssignment.dart.intertwined.expect | 4 +- ..._insideDeclaration.dart.intertwined.expect | 2 +- ..._insideDeclaration.dart.intertwined.expect | 2 +- ..._insideDeclaration.dart.intertwined.expect | 2 +- ..._insideDeclaration.dart.intertwined.expect | 2 +- ...d_insideAssignment.dart.intertwined.expect | 4 +- ..._insideDeclaration.dart.intertwined.expect | 2 +- ...ment_disallowsLate.dart.intertwined.expect | 14 +- ...ta_final_extractor.dart.intertwined.expect | 2 +- ...data_var_extractor.dart.intertwined.expect | 2 +- ...oMetadata_var_list.dart.intertwined.expect | 2 +- ...noMetadata_var_map.dart.intertwined.expect | 2 +- ..._var_parenthesized.dart.intertwined.expect | 2 +- ...etadata_var_record.dart.intertwined.expect | 2 +- ...ta_final_extractor.dart.intertwined.expect | 4 +- ...etadata_final_list.dart.intertwined.expect | 4 +- ...Metadata_final_map.dart.intertwined.expect | 4 +- ...inal_parenthesized.dart.intertwined.expect | 4 +- ...adata_final_record.dart.intertwined.expect | 4 +- ...data_var_extractor.dart.intertwined.expect | 4 +- ...hMetadata_var_list.dart.intertwined.expect | 4 +- ...thMetadata_var_map.dart.intertwined.expect | 4 +- ..._var_parenthesized.dart.intertwined.expect | 4 +- ...etadata_var_record.dart.intertwined.expect | 4 +- .../pattern_inForInitializer_element.dart | 1 + ...ttern_inForInitializer_element.dart.expect | 43 ++ ...nitializer_element.dart.intertwined.expect | 109 +++++ ...nForInitializer_element.dart.parser.expect | 5 + ...ForInitializer_element.dart.scanner.expect | 5 + .../pattern_inForInitializer_statement.dart | 3 + ...ern_inForInitializer_statement.dart.expect | 45 ++ ...tializer_statement.dart.intertwined.expect | 105 +++++ ...orInitializer_statement.dart.parser.expect | 9 + ...rInitializer_statement.dart.scanner.expect | 9 + ...deAssignment_empty.dart.intertwined.expect | 4 +- ...ssignment_oneField.dart.intertwined.expect | 4 +- ...signment_twoFields.dart.intertwined.expect | 4 +- ...eDeclaration_empty.dart.intertwined.expect | 2 +- ...claration_oneField.dart.intertwined.expect | 2 +- ...laration_twoFields.dart.intertwined.expect | 2 +- ...ipOuterPattern_eof.dart.intertwined.expect | 4 +- ...le_bare_insideCast.dart.intertwined.expect | 2 +- ...e_insideNullAssert.dart.intertwined.expect | 2 +- .../record/is_and_as.dart.intertwined.expect | 6 +- ...itional_expression.dart.intertwined.expect | 2 +- .../record_and_commas.dart.intertwined.expect | 32 +- .../record_literal_01.dart.intertwined.expect | 12 +- .../record_literal_02.dart.intertwined.expect | 16 +- .../record_literal_03.dart.intertwined.expect | 8 +- .../record_literal_04.dart.intertwined.expect | 12 +- .../record_type_01.dart.intertwined.expect | 74 ++-- .../record_type_02.dart.intertwined.expect | 20 +- .../record_type_04.dart.intertwined.expect | 24 +- ..._as_type_arguments.dart.intertwined.expect | 8 +- ...record_type_getter.dart.intertwined.expect | 96 ++--- ...d_type_in_for_loop.dart.intertwined.expect | 8 +- pkg/front_end/test/parser_test_listener.dart | 10 + pkg/front_end/test/parser_test_parser.dart | 35 +- .../test/parser_test_parser_creator.dart | 2 +- 254 files changed, 1676 insertions(+), 1145 deletions(-) create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.expect create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.intertwined.expect create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.parser.expect create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.scanner.expect create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.expect create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.intertwined.expect create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.parser.expect create mode 100644 pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.scanner.expect 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 73945fd52108..7772f376144d 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart @@ -1480,6 +1480,12 @@ class ForwardingListener implements Listener { listener?.handleForInitializerLocalVariableDeclaration(token, forIn); } + @override + void handleForInitializerPatternVariableAssignment( + Token keyword, Token equals) { + listener?.handleForInitializerPatternVariableAssignment(keyword, equals); + } + @override void handleForInLoopParts(Token? awaitToken, Token forToken, Token leftParenthesis, Token inKeyword) { diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart index f71600a1962f..3d981634c85f 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart @@ -585,11 +585,20 @@ class Listener implements UnescapeErrorListener { } /// Marks that the grammar term `forInitializerStatement` has been parsed and - /// it was a `localVariableDeclaration`. + /// it was a `localVariableDeclaration` of the form + /// `metadata initializedVariableDeclaration ';'`. void handleForInitializerLocalVariableDeclaration(Token token, bool forIn) { logEvent("ForInitializerLocalVariableDeclaration"); } + /// Marks that the grammar term `forInitializerStatement` has been parsed and + /// it was a `localVariableDeclaration` of the form + /// `metadata patternVariableDeclaration ';'`. + void handleForInitializerPatternVariableAssignment( + Token keyword, Token equals) { + logEvent("handleForInitializerPatternVariableAssignment"); + } + /// Marks the start of a for statement which is ended by either /// [endForStatement] or [endForIn]. void beginForStatement(Token token) {} diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/literal_entry_info_impl.dart b/pkg/_fe_analyzer_shared/lib/src/parser/literal_entry_info_impl.dart index bb0c2ec9bd7e..ec0362e56d70 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/literal_entry_info_impl.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/literal_entry_info_impl.dart @@ -33,7 +33,24 @@ class ForCondition extends LiteralEntryInfo { assert(optional('for', forToken)); parser.listener.beginForControlFlow(awaitToken, forToken); - token = parser.parseForLoopPartsStart(awaitToken, forToken); + ForPartsContext forPartsContext = new ForPartsContext(); + token = + parser.parseForLoopPartsStart(awaitToken, forToken, forPartsContext); + Token? patternKeyword = forPartsContext.patternKeyword; + if (patternKeyword != null) { + if (optional('=', token.next!)) { + // Process `for ( pattern = expression ; ... ; ... )` + Token equals = token.next!; + token = parser.parseExpression(equals); + parser.listener.handleForInitializerPatternVariableAssignment( + patternKeyword, equals); + _inStyle = false; + return parser.parseForLoopPartsRest(token, forToken, awaitToken); + } else { + // Process `for ( pattern in expression )` + throw new UnimplementedError('TODO(paulberry)'); + } + } Token identifier = token.next!; token = parser.parseForLoopPartsMid(token, awaitToken, forToken); 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 38eb541675b5..0b803fa19e4d 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart @@ -5234,8 +5234,7 @@ class Parser { token, /* lateToken = */ null, /* varFinalOrConst = */ null, - /* typeInfo = */ null, - /* onlyParseVariableDeclarationStart = */ false); + /* typeInfo = */ null); } final String? value = token.next!.stringValue; if (identical(value, '{')) { @@ -5251,13 +5250,8 @@ class Parser { } else if (identical(value, 'var') || identical(value, 'final')) { Token varOrFinal = token.next!; if (!isModifier(varOrFinal.next!)) { - return parseExpressionStatementOrDeclarationAfterModifiers( - varOrFinal, - token, - /* lateToken = */ null, - varOrFinal, - /* typeInfo = */ null, - /* onlyParseVariableDeclarationStart = */ false); + return parseExpressionStatementOrDeclarationAfterModifiers(varOrFinal, + token, /* lateToken = */ null, varOrFinal, /* typeInfo = */ null); } return parseExpressionStatementOrDeclaration(token); } else if (identical(value, 'if')) { @@ -7358,30 +7352,30 @@ class Parser { } } return parseExpressionStatementOrDeclarationAfterModifiers( - constToken, - start, - /* lateToken = */ null, - constToken, - typeInfo, - /* onlyParseVariableDeclarationStart = */ false); + constToken, start, /* lateToken = */ null, constToken, typeInfo); } return parseExpressionStatementOrDeclaration(start); } /// This method has two modes based upon [onlyParseVariableDeclarationStart]. /// - /// If [onlyParseVariableDeclarationStart] is `false` (the default) then this - /// method will parse a local variable declaration, a local function, - /// or an expression statement, and then return the last consumed token. + /// If [forPartsContext] is `null` (the default), then the parser is currently + /// processing a statement or declaration. This method will parse a local + /// variable declaration, a local function, or an expression statement, and + /// then return the last consumed token. /// - /// If [onlyParseVariableDeclarationStart] is `true` then this method - /// will only parse the metadata, modifiers, and type of a local variable - /// declaration if it exists. It is the responsibility of the caller to - /// call [parseVariablesDeclarationRest] to finish parsing the local variable - /// declaration. If a local variable declaration is not found then this - /// method will return [start]. + /// If [forPartsContext] is non-null, then this method will only parse the + /// metadata, modifiers, and type of a local variable declaration if it + /// exists; it is the responsibility of the caller to call + /// [parseVariablesDeclarationRest] to finish parsing the local variable + /// declaration. Or it will parse the metadata, `var` or `final` keyword, and + /// pattern of a pattern variable declaration, and store the `var` or `final` + /// keyword in [forPartsContext]; it is the responsibility of the caller to + /// consume the rest of the pattern variable declaration. Or, if neither a + /// local variable declaration nor a pattern variable declaration is found, + /// then this method will return [start]. Token parseExpressionStatementOrDeclaration(final Token start, - [bool onlyParseVariableDeclarationStart = false]) { + [ForPartsContext? forPartsContext]) { Token token = start; Token next = token.next!; if (optional('@', next)) { @@ -7424,13 +7418,8 @@ class Parser { } } - return parseExpressionStatementOrDeclarationAfterModifiers( - token, - start, - lateToken, - varFinalOrConst, - /* typeInfo = */ null, - onlyParseVariableDeclarationStart); + return parseExpressionStatementOrDeclarationAfterModifiers(token, start, + lateToken, varFinalOrConst, /* typeInfo = */ null, forPartsContext); } /// See [parseExpressionStatementOrDeclaration]. @@ -7438,13 +7427,9 @@ class Parser { /// If `start.next` is an `@` token (i.e. this is a declaration with metadata) /// then the caller should parse it before calling this method; otherwise, /// this method will handle the lack of metadata appropriately. - Token parseExpressionStatementOrDeclarationAfterModifiers( - Token beforeType, - Token start, - Token? lateToken, - Token? varFinalOrConst, - TypeInfo? typeInfo, - bool onlyParseVariableDeclarationStart) { + Token parseExpressionStatementOrDeclarationAfterModifiers(Token beforeType, + Token start, Token? lateToken, Token? varFinalOrConst, TypeInfo? typeInfo, + [ForPartsContext? forPartsContext]) { // In simple cases check for bad 'late' modifier in non-nnbd-mode. if (typeInfo == null && lateToken == null && @@ -7470,7 +7455,6 @@ class Parser { varFinalOrConst != null && (optional('var', varFinalOrConst) || optional('final', varFinalOrConst)) && - !onlyParseVariableDeclarationStart && looksLikeOuterPatternEquals(beforeType)) { // If there was any metadata, then the caller was responsible for parsing // it; if not, then we need to let the listener know there wasn't any. @@ -7478,8 +7462,13 @@ class Parser { listener.beginMetadataStar(start.next!); listener.endMetadataStar(/* count = */ 0); } - return parsePatternVariableDeclarationStatement( - beforeType, start, varFinalOrConst); + if (forPartsContext != null) { + forPartsContext.patternKeyword = varFinalOrConst; + return parsePattern(beforeType, isRefutableContext: false); + } else { + return parsePatternVariableDeclarationStatement( + beforeType, start, varFinalOrConst); + } } typeInfo ??= computeType(beforeType, /* required = */ false); @@ -7487,7 +7476,7 @@ class Parser { Token token = typeInfo.skipType(beforeType); Token next = token.next!; - if (onlyParseVariableDeclarationStart) { + if (forPartsContext != null) { if (lateToken != null) { reportRecoverableErrorWithToken( lateToken, codes.templateExtraneousModifier); @@ -7575,7 +7564,7 @@ class Parser { if (token == start) { // If no annotation, modifier, or type, and this is not a local function // then this must be an expression statement. - if (onlyParseVariableDeclarationStart) { + if (forPartsContext != null) { return start; } else { return parseExpressionStatement(start); @@ -7592,7 +7581,7 @@ class Parser { if (EQ_TOKEN != kind && SEMICOLON_TOKEN != kind && COMMA_TOKEN != kind) { - if (onlyParseVariableDeclarationStart) { + if (forPartsContext != null) { if (!optional('in', next.next!)) { return start; } @@ -7627,7 +7616,7 @@ class Parser { token = typeInfo.parseType(beforeType, this); next = token.next!; listener.beginVariablesDeclaration(next, lateToken, varFinalOrConst); - if (!onlyParseVariableDeclarationStart) { + if (forPartsContext == null) { token = parseVariablesDeclarationRest(token, /* endWithSemicolon = */ true); } @@ -7707,7 +7696,22 @@ class Parser { assert(optional('for', token)); listener.beginForStatement(forToken); - token = parseForLoopPartsStart(awaitToken, forToken); + ForPartsContext forPartsContext = new ForPartsContext(); + token = parseForLoopPartsStart(awaitToken, forToken, forPartsContext); + Token? patternKeyword = forPartsContext.patternKeyword; + if (patternKeyword != null) { + if (optional('=', token.next!)) { + // Process `for ( pattern = expression ; ... ; ... )` + Token equals = token.next!; + token = parseExpression(equals); + listener.handleForInitializerPatternVariableAssignment( + patternKeyword, equals); + return parseForRest(awaitToken, token, forToken); + } else { + // Process `for ( pattern in expression )` + throw new UnimplementedError('TODO(paulberry)'); + } + } Token identifier = token.next!; token = parseForLoopPartsMid(token, awaitToken, forToken); if (optional('in', token.next!) || optional(':', token.next!)) { @@ -7721,7 +7725,8 @@ class Parser { /// Parse the start of a for loop control structure /// from the open parenthesis up to but not including the identifier. - Token parseForLoopPartsStart(Token? awaitToken, Token forToken) { + Token parseForLoopPartsStart( + Token? awaitToken, Token forToken, ForPartsContext forPartsContext) { Token leftParenthesis = forToken.next!; if (!optional('(', leftParenthesis)) { // Recovery @@ -7757,7 +7762,7 @@ class Parser { // declaration if it exists. This enables capturing [beforeIdentifier] // for later error reporting. return parseExpressionStatementOrDeclaration( - leftParenthesis, /* onlyParseVariableDeclarationStart = */ true); + leftParenthesis, forPartsContext); } /// Parse the remainder of the local variable declaration @@ -9953,3 +9958,14 @@ class Parser { typedef _MessageWithArgument = codes.Message Function(T); enum AwaitOrYieldContext { Statement, UnaryExpression } + +/// Data structure tracking additional information when parsing the +/// `forLoopParts` grammar production. +class ForPartsContext { + /// If `forLoopParts` began with `( 'final' | 'var' ) outerPattern`, followed + /// by `=`, the `final` or `var` keyword. Otherwise `null`. + Token? patternKeyword; + + @override + String toString() => 'ForPartsContext($patternKeyword)'; +} diff --git a/pkg/analyzer/lib/src/dart/ast/ast.dart b/pkg/analyzer/lib/src/dart/ast/ast.dart index fb23217d7100..c44302ad4e34 100644 --- a/pkg/analyzer/lib/src/dart/ast/ast.dart +++ b/pkg/analyzer/lib/src/dart/ast/ast.dart @@ -5511,8 +5511,9 @@ class ForPartsWithPatternImpl extends ForPartsImpl Token get beginToken => variables.beginToken; @override - ChildEntities get _childEntities => - super._childEntities..addNode('variables', variables); + ChildEntities get _childEntities => ChildEntities() + ..addNode('variables', variables) + ..addAll(super._childEntities); @override E? accept(AstVisitor visitor) => visitor.visitForPartsWithPattern(this); diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart index a1468e0062aa..662c914a916f 100644 --- a/pkg/analyzer/lib/src/fasta/ast_builder.dart +++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart @@ -4026,6 +4026,21 @@ class AstBuilder extends StackListener { debugEvent("ForInitializerLocalVariableDeclaration"); } + @override + void handleForInitializerPatternVariableAssignment( + Token keyword, Token equals) { + var expression = pop() as ExpressionImpl; + var pattern = pop() as DartPatternImpl; + var metadata = pop() as List?; + push(PatternVariableDeclarationImpl( + keyword: keyword, + pattern: pattern, + equals: equals, + expression: expression, + comment: null, + metadata: metadata)); + } + @override void handleForInLoopParts(Token? awaitToken, Token forToken, Token leftParenthesis, Token inKeyword) { @@ -4102,6 +4117,13 @@ class AstBuilder extends StackListener { rightSeparator: rightSeparator, updaters: updates, ); + } else if (initializerPart is PatternVariableDeclarationImpl) { + forLoopParts = ForPartsWithPatternImpl( + variables: initializerPart, + leftSeparator: leftSeparator, + condition: condition, + rightSeparator: rightSeparator, + updaters: updates); } else { forLoopParts = ForPartsWithExpressionImpl( initialization: initializerPart as ExpressionImpl?, diff --git a/pkg/analyzer/test/generated/patterns_parser_test.dart b/pkg/analyzer/test/generated/patterns_parser_test.dart index 107812440e09..e4ff75651eba 100644 --- a/pkg/analyzer/test/generated/patterns_parser_test.dart +++ b/pkg/analyzer/test/generated/patterns_parser_test.dart @@ -5995,6 +5995,75 @@ PostfixPattern '''); } + test_pattern_inForInitializer_element() { + _parse(''' +void f(x) => [for (var (a, b) = x; ;) 0]; +'''); + var node = findNode.forElement('for'); + assertParsedNodeText(node, r''' +ForElement + forKeyword: for + leftParenthesis: ( + forLoopParts: ForPartsWithPattern + variables: PatternVariableDeclaration + keyword: var + pattern: RecordPattern + leftParenthesis: ( + fields + RecordPatternField + pattern: VariablePattern + name: a + RecordPatternField + pattern: VariablePattern + name: b + rightParenthesis: ) + equals: = + expression: SimpleIdentifier + token: x + leftSeparator: ; + rightSeparator: ; + rightParenthesis: ) + body: IntegerLiteral + literal: 0 +'''); + } + + test_pattern_inForInitializer_statement() { + _parse(''' +void f(x) { + for (var (a, b) = x; ;) {} +} +'''); + var node = findNode.forStatement('for'); + assertParsedNodeText(node, r''' +ForStatement + forKeyword: for + leftParenthesis: ( + forLoopParts: ForPartsWithPattern + variables: PatternVariableDeclaration + keyword: var + pattern: RecordPattern + leftParenthesis: ( + fields + RecordPatternField + pattern: VariablePattern + name: a + RecordPatternField + pattern: VariablePattern + name: b + rightParenthesis: ) + equals: = + expression: SimpleIdentifier + token: x + leftSeparator: ; + rightSeparator: ; + rightParenthesis: ) + body: Block + leftBracket: { + rightBracket: } +'''); + } + test_patternVariableDeclarationStatement_disallowsLate() { // TODO(paulberry): do better error recovery. _parse(''' diff --git a/pkg/analyzer/test/src/summary/resolved_ast_printer.dart b/pkg/analyzer/test/src/summary/resolved_ast_printer.dart index 0800b5d9ee1d..d0bb2c0eec68 100644 --- a/pkg/analyzer/test/src/summary/resolved_ast_printer.dart +++ b/pkg/analyzer/test/src/summary/resolved_ast_printer.dart @@ -550,6 +550,14 @@ class ResolvedAstPrinter extends ThrowingAstVisitor { }); } + @override + void visitForElement(ForElement node) { + _writeln('ForElement'); + _withIndent(() { + _writeNamedChildEntities(node); + }); + } + @override void visitFormalParameterList(FormalParameterList node) { _writeln('FormalParameterList'); @@ -574,6 +582,14 @@ class ResolvedAstPrinter extends ThrowingAstVisitor { }); } + @override + void visitForPartsWithPattern(ForPartsWithPattern node) { + _writeln('ForPartsWithPattern'); + _withIndent(() { + _writeNamedChildEntities(node); + }); + } + @override void visitForStatement(ForStatement node) { _writeln('ForStatement'); 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 55182d855253..1af8ac743f00 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 @@ -1786,6 +1786,12 @@ class _MacroListener implements Listener { _unsupported(); } + @override + void handleForInitializerPatternVariableAssignment( + Token keyword, Token equals) { + _unsupported(); + } + @override void handleForLoopParts(Token forKeyword, Token leftParen, Token leftSeparator, int updateExpressionCount) { 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 a13d52c6048d..fb110945f608 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 @@ -756,6 +756,15 @@ abstract class AbstractParserAstListener implements Listener { seen(data); } + @override + void handleForInitializerPatternVariableAssignment( + Token keyword, Token equals) { + ForInitializerPatternVariableAssignmentHandle data = + new ForInitializerPatternVariableAssignmentHandle(ParserAstType.HANDLE, + keyword: keyword, equals: equals); + seen(data); + } + @override void beginForStatement(Token token) { ForStatementBegin data = @@ -4231,6 +4240,21 @@ class ForInitializerLocalVariableDeclarationHandle extends ParserAstNode { }; } +class ForInitializerPatternVariableAssignmentHandle extends ParserAstNode { + final Token keyword; + final Token equals; + + ForInitializerPatternVariableAssignmentHandle(ParserAstType type, + {required this.keyword, required this.equals}) + : super("ForInitializerPatternVariableAssignment", type); + + @override + Map get deprecatedArguments => { + "keyword": keyword, + "equals": equals, + }; +} + class ForStatementBegin extends ParserAstNode { final Token token; 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 cd254681d06b..4895683f4f37 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 @@ -28,7 +28,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseExpressionStatement({) parseExpression({) parsePrecedenceExpression({, 1, true) @@ -74,10 +74,10 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExtraneousModifier, Can't have modifier 'augment' here., Try removing 'augment'., {lexeme: augment}], augment, augment) - parseExpressionStatementOrDeclarationAfterModifiers(augment, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(augment, {, null, null, null, null) looksLikeLocalFunction(local) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -98,8 +98,8 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(augment) parseExpressionStatement(;) parseExpression(;) @@ -231,7 +231,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseExpressionStatement({) parseExpression({) parsePrecedenceExpression({, 1, true) @@ -273,7 +273,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) + parseExpressionStatementOrDeclaration(;, null) parseExpressionStatement(;) parseExpression(;) parsePrecedenceExpression(;, 1, true) @@ -326,7 +326,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseExpressionStatement({) parseExpression({) parsePrecedenceExpression({, 1, true) @@ -345,7 +345,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) + parseExpressionStatementOrDeclaration(;, null) parseExpressionStatement(;) parseExpression(;) parsePrecedenceExpression(;, 1, true) @@ -358,10 +358,10 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) + parseExpressionStatementOrDeclaration(;, null) reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExtraneousModifier, Can't have modifier 'augment' here., Try removing 'augment'., {lexeme: augment}], augment, augment) - parseExpressionStatementOrDeclarationAfterModifiers(augment, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(augment, ;, null, null, null, null) looksLikeLocalFunction(local) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -382,8 +382,8 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(augment) parseExpressionStatement(;) parseExpression(;) @@ -460,7 +460,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseExpressionStatement({) parseExpression({) parsePrecedenceExpression({, 1, true) @@ -510,10 +510,10 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExtraneousModifier, Can't have modifier 'augment' here., Try removing 'augment'., {lexeme: augment}], augment, augment) - parseExpressionStatementOrDeclarationAfterModifiers(augment, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(augment, {, null, null, null, null) looksLikeLocalFunction(local) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -534,8 +534,8 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(augment) parseExpressionStatement(;) parseExpression(;) @@ -588,7 +588,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseExpressionStatement({) parseExpression({) parsePrecedenceExpression({, 1, true) @@ -602,8 +602,8 @@ parseUnit(augment) notEofOrValue(}, --) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(--) parseExpressionStatement(;) parseExpression(;) @@ -680,7 +680,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseExpressionStatement({) parseExpression({) parsePrecedenceExpression({, 1, true) @@ -737,7 +737,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseExpressionStatement({) parseExpression({) parsePrecedenceExpression({, 1, true) @@ -756,7 +756,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) + parseExpressionStatementOrDeclaration(;, null) parseExpressionStatement(;) parseExpression(;) parsePrecedenceExpression(;, 1, true) @@ -769,10 +769,10 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) + parseExpressionStatementOrDeclaration(;, null) reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExtraneousModifier, Can't have modifier 'augment' here., Try removing 'augment'., {lexeme: augment}], augment, augment) - parseExpressionStatementOrDeclarationAfterModifiers(augment, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(augment, ;, null, null, null, null) looksLikeLocalFunction(local) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -793,8 +793,8 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(augment) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_00.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_00.dart.intertwined.expect index b3850613b2f2..ad8fc744c624 100644 --- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_00.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_00.dart.intertwined.expect @@ -28,8 +28,8 @@ parseUnit(void) notEofOrValue(}, [) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction([) parseExpressionStatement({) parseExpression({) @@ -87,8 +87,8 @@ parseUnit(void) notEofOrValue(}, [) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction([) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_02.dart.intertwined.expect index 1d02334d949b..d1371b46136a 100644 --- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_02.dart.intertwined.expect @@ -34,8 +34,8 @@ parseUnit(UnmatchedToken([)) notEofOrValue(}, [) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction([) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_03.dart.intertwined.expect index 03de5d4f77d9..39fee7ce93b9 100644 --- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_03.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_03.dart.intertwined.expect @@ -34,7 +34,7 @@ parseUnit(void) notEofOrValue(}, foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement({) parseExpression({) @@ -62,8 +62,8 @@ parseUnit(void) notEofOrValue(}, )) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction()) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_04.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_04.dart.intertwined.expect index 9bab235b664f..e5e8db92c4d9 100644 --- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_04.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_04.dart.intertwined.expect @@ -28,7 +28,7 @@ parseUnit(void) notEofOrValue(}, foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement({) parseExpression({) @@ -67,7 +67,7 @@ parseUnit(void) notEofOrValue(}, bar) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(bar) parseExpressionStatement({) parseExpression({) @@ -95,8 +95,8 @@ parseUnit(void) notEofOrValue(}, )) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction()) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_05.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_05.dart.intertwined.expect index d0d524e15b00..84329b0f9e95 100644 --- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_05.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_05.dart.intertwined.expect @@ -34,8 +34,8 @@ parseUnit(UnmatchedToken([)) notEofOrValue(}, [) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction([) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_06.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_06.dart.intertwined.expect index 050a0b9e8e68..6d6a27bdcd77 100644 --- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_06.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_06.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(UnmatchedToken(()) notEofOrValue(}, new) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(new) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/error_recovery/comment_on_non_ascii_identifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/comment_on_non_ascii_identifier.dart.intertwined.expect index 0e976645fd34..a84a466881b2 100644 --- a/pkg/front_end/parser_testcases/error_recovery/comment_on_non_ascii_identifier.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/comment_on_non_ascii_identifier.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(NonAsciiIdentifierToken(230)) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(æFoo) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -57,7 +57,7 @@ parseUnit(NonAsciiIdentifierToken(230)) notEofOrValue(}, int) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(fooÆ) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -85,7 +85,7 @@ parseUnit(NonAsciiIdentifierToken(230)) notEofOrValue(}, int) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(foo) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -113,7 +113,7 @@ parseUnit(NonAsciiIdentifierToken(230)) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -151,7 +151,7 @@ parseUnit(NonAsciiIdentifierToken(230)) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -189,7 +189,7 @@ parseUnit(NonAsciiIdentifierToken(230)) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/empty_await_for.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/empty_await_for.dart.intertwined.expect index 32971a6a5496..cd4e45cf551b 100644 --- a/pkg/front_end/parser_testcases/error_recovery/empty_await_for.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/empty_await_for.dart.intertwined.expect @@ -31,9 +31,9 @@ parseUnit(main) parseStatementX({) parseForStatement(await, await) listener: beginForStatement(for) - parseForLoopPartsStart(await, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, true) + parseForLoopPartsStart(await, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, ForPartsContext(null)) parseForLoopPartsMid((, await, for) parseExpression(() parsePrecedenceExpression((, 1, true) diff --git a/pkg/front_end/parser_testcases/error_recovery/empty_for.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/empty_for.dart.intertwined.expect index fb0bab685932..a2fda336b894 100644 --- a/pkg/front_end/parser_testcases/error_recovery/empty_for.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/empty_for.dart.intertwined.expect @@ -31,9 +31,9 @@ parseUnit(main) parseStatementX({) parseForStatement({, null) listener: beginForStatement(for) - parseForLoopPartsStart(null, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, true) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, ForPartsContext(null)) parseForLoopPartsMid((, null, for) parseExpression(() parsePrecedenceExpression((, 1, true) diff --git a/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect index 41327a05ec7b..be4dcf8fdf47 100644 --- a/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect @@ -216,7 +216,7 @@ parseUnit(extension) notEofOrValue(}, l) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(l) parseExpressionStatement({) parseExpression({) @@ -294,7 +294,7 @@ parseUnit(extension) notEofOrValue(}, l) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) listener: beginMetadataStar(l) listener: endMetadataStar(0) @@ -320,8 +320,8 @@ parseUnit(extension) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/for_in_with_colon.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/for_in_with_colon.dart.intertwined.expect index bcc5d7765952..7b27c79ce488 100644 --- a/pkg/front_end/parser_testcases/error_recovery/for_in_with_colon.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/for_in_with_colon.dart.intertwined.expect @@ -31,9 +31,9 @@ parseUnit(main) parseStatementX({) parseForStatement({, null) listener: beginForStatement(for) - parseForLoopPartsStart(null, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, true) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, ForPartsContext(null)) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: handleIdentifier(int, typeReference) @@ -93,7 +93,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) 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 40e0b544e43b..6fcb355c26c2 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 @@ -90,7 +90,7 @@ parseUnit(class) notEofOrValue(}, C) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(C) parseExpressionStatement({) parseExpression({) 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 0f7328adfbdc..a24736365fab 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 @@ -1193,7 +1193,7 @@ parseUnit(abstract) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(z) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -1332,7 +1332,7 @@ parseUnit(abstract) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(z) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -1902,7 +1902,7 @@ parseUnit(abstract) notEofOrValue(}, s) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(s) parseExpressionStatement({) parseExpression({) @@ -2005,7 +2005,7 @@ parseUnit(abstract) notEofOrValue(}, s) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(s) parseExpressionStatement(;) parseExpression(;) @@ -2254,7 +2254,7 @@ parseUnit(abstract) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -2475,7 +2475,7 @@ parseUnit(abstract) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -2594,7 +2594,7 @@ parseUnit(abstract) notEofOrValue(}, x) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(xor) listener: beginMetadataStar(x) listener: endMetadataStar(0) @@ -2618,7 +2618,7 @@ parseUnit(abstract) notEofOrValue(}, y) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y) parseExpressionStatement(;) parseExpression(;) @@ -2639,7 +2639,7 @@ parseUnit(abstract) notEofOrValue(}, x) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement(;) parseExpression(;) 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 bb27e99007da..f274a5546612 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 @@ -1195,7 +1195,7 @@ parseUnit(abstract) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(z) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -1334,7 +1334,7 @@ parseUnit(abstract) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(z) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -1906,7 +1906,7 @@ parseUnit(abstract) notEofOrValue(}, s) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(s) parseExpressionStatement({) parseExpression({) @@ -2009,7 +2009,7 @@ parseUnit(abstract) notEofOrValue(}, s) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(s) parseExpressionStatement(;) parseExpression(;) @@ -2258,7 +2258,7 @@ parseUnit(abstract) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -2479,7 +2479,7 @@ parseUnit(abstract) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -2598,7 +2598,7 @@ parseUnit(abstract) notEofOrValue(}, x) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(and) listener: beginMetadataStar(x) listener: endMetadataStar(0) @@ -2622,7 +2622,7 @@ parseUnit(abstract) notEofOrValue(}, y) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y) parseExpressionStatement(;) parseExpression(;) @@ -2643,7 +2643,7 @@ parseUnit(abstract) notEofOrValue(}, x) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement(;) parseExpression(;) 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 544b2612b8e6..d59bb5e9fd6c 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 @@ -1195,7 +1195,7 @@ parseUnit(abstract) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(z) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -1334,7 +1334,7 @@ parseUnit(abstract) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(z) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -1906,7 +1906,7 @@ parseUnit(abstract) notEofOrValue(}, s) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(s) parseExpressionStatement({) parseExpression({) @@ -2009,7 +2009,7 @@ parseUnit(abstract) notEofOrValue(}, s) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(s) parseExpressionStatement(;) parseExpression(;) @@ -2258,7 +2258,7 @@ parseUnit(abstract) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -2479,7 +2479,7 @@ parseUnit(abstract) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -2598,7 +2598,7 @@ parseUnit(abstract) notEofOrValue(}, x) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(or) listener: beginMetadataStar(x) listener: endMetadataStar(0) @@ -2622,7 +2622,7 @@ parseUnit(abstract) notEofOrValue(}, y) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y) parseExpressionStatement(;) parseExpression(;) @@ -2643,7 +2643,7 @@ parseUnit(abstract) notEofOrValue(}, x) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_38415.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_38415.crash_dart.intertwined.expect index dc4c2331d674..57cb21923b01 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_38415.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_38415.crash_dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(UnmatchedToken(()) notEofOrValue(}, m) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(m) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39058.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39058.crash_dart.intertwined.expect index 4bbd14369265..584fcc0b3ee5 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39058.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39058.crash_dart.intertwined.expect @@ -17,8 +17,8 @@ parseUnit(UnmatchedToken(()) notEofOrValue(}, <) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(<) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39058_prime.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39058_prime.crash_dart.intertwined.expect index 4ed5364d5ade..5b3514d1af53 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39058_prime.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39058_prime.crash_dart.intertwined.expect @@ -17,8 +17,8 @@ parseUnit({) notEofOrValue(}, <) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(<) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39060.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39060.dart.intertwined.expect index 0764dff4d775..d28fdff905a8 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39060.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39060.dart.intertwined.expect @@ -35,7 +35,7 @@ parseUnit(main) notEofOrValue(}, s) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(A) listener: beginMetadataStar(s) listener: endMetadataStar(0) @@ -59,8 +59,8 @@ parseUnit(main) notEofOrValue(}, <) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(<) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_42267.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_42267.dart.intertwined.expect index ef58d4495ead..ab72ecb6c027 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_42267.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_42267.dart.intertwined.expect @@ -28,7 +28,7 @@ parseUnit(void) notEofOrValue(}, builder) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(builder) parseExpressionStatement({) parseExpression({) @@ -77,7 +77,7 @@ parseUnit(void) notEofOrValue(}, FilterSet) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(FilterSet) parseExpressionStatement(;) parseExpression(;) @@ -174,7 +174,7 @@ parseUnit(void) notEofOrValue(}, builder) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(builder) parseExpressionStatement(;) parseExpression(;) @@ -228,7 +228,7 @@ parseUnit(void) notEofOrValue(}, FilterSet) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(FilterSet) parseExpressionStatement(;) parseExpression(;) @@ -330,7 +330,7 @@ parseUnit(void) notEofOrValue(}, builder) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(builder) parseExpressionStatement(;) parseExpression(;) @@ -381,7 +381,7 @@ parseUnit(void) notEofOrValue(}, FilterSet) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(FilterSet) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45327.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45327.crash_dart.intertwined.expect index ac7b8a7fb3eb..928bc965b824 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45327.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45327.crash_dart.intertwined.expect @@ -71,7 +71,7 @@ parseUnit(UnmatchedToken(()) listener: beginThenStatement(or) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(or) parseExpressionStatement()) parseExpression()) 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 cce9a3c0c353..b842e8fb30d7 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 @@ -118,7 +118,7 @@ parseUnit(UnmatchedToken(()) listener: beginThenStatement(or) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(or) parseExpressionStatement()) parseExpression()) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48288.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48288.dart.intertwined.expect index 3c69aeee120e..7d75e4f3b705 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48288.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48288.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48288_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48288_prime.dart.intertwined.expect index e7e4c1e8a0c2..dec02895cbf4 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48288_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48288_prime.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) 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 e01f55a27842..f17501b86671 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 @@ -103,7 +103,7 @@ parseUnit(enum) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect index d8ae31956b22..e626106792a9 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect @@ -65,7 +65,7 @@ parseUnit(enum) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) 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 31460047022a..4fcdde81bfa6 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 @@ -227,7 +227,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(}) parseExpression(}) @@ -280,7 +280,7 @@ parseUnit(Future) notEofOrValue(}, xor) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(xor) parseExpressionStatement(;) parseExpression(;) @@ -455,7 +455,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -603,7 +603,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -751,7 +751,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -833,8 +833,8 @@ parseUnit(Future) notEofOrValue(}, !) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(!) parseExpressionStatement(;) parseExpression(;) @@ -905,7 +905,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -993,7 +993,7 @@ parseUnit(Future) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(f) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -1033,8 +1033,8 @@ parseUnit(Future) inPlainSync() looksLikeAwaitExpression(;, AwaitOrYieldContext.Statement) looksLikeExpressionAfterAwaitOrYield(await, AwaitOrYieldContext.Statement) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f) listener: beginMetadataStar(await) listener: endMetadataStar(0) @@ -1145,7 +1145,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(}) parseExpression(}) @@ -1194,7 +1194,7 @@ parseUnit(Future) notEofOrValue(}, xor) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(xor) parseExpressionStatement(;) parseExpression(;) @@ -1349,7 +1349,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -1481,7 +1481,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -1613,7 +1613,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -1687,8 +1687,8 @@ parseUnit(Future) notEofOrValue(}, !) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(!) parseExpressionStatement(;) parseExpression(;) @@ -1751,7 +1751,7 @@ parseUnit(Future) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -1834,8 +1834,8 @@ parseUnit(Future) inPlainSync() looksLikeAwaitExpression(;, AwaitOrYieldContext.Statement) looksLikeExpressionAfterAwaitOrYield(await, AwaitOrYieldContext.Statement) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) listener: beginMetadataStar(await) listener: endMetadataStar(0) @@ -1859,8 +1859,8 @@ parseUnit(Future) inPlainSync() looksLikeAwaitExpression(;, AwaitOrYieldContext.Statement) looksLikeExpressionAfterAwaitOrYield(await, AwaitOrYieldContext.Statement) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y) listener: beginMetadataStar(await) listener: endMetadataStar(0) @@ -1891,8 +1891,8 @@ parseUnit(Future) inPlainSync() looksLikeAwaitExpression(;, AwaitOrYieldContext.Statement) looksLikeExpressionAfterAwaitOrYield(await, AwaitOrYieldContext.Statement) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x2) listener: beginMetadataStar(await) listener: endMetadataStar(0) @@ -1935,8 +1935,8 @@ parseUnit(Future) inPlainSync() looksLikeAwaitExpression(;, AwaitOrYieldContext.Statement) looksLikeExpressionAfterAwaitOrYield(await, AwaitOrYieldContext.Statement) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y2) listener: beginMetadataStar(await) listener: endMetadataStar(0) @@ -2005,8 +2005,8 @@ parseUnit(Future) inPlainSync() looksLikeAwaitExpression(;, AwaitOrYieldContext.Statement) looksLikeExpressionAfterAwaitOrYield(await, AwaitOrYieldContext.Statement) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(foo) listener: beginMetadataStar(await) listener: endMetadataStar(0) @@ -2082,8 +2082,8 @@ parseUnit(Future) inPlainSync() looksLikeAwaitExpression(}, AwaitOrYieldContext.Statement) looksLikeExpressionAfterAwaitOrYield(await, AwaitOrYieldContext.Statement) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(bar) listener: beginMetadataStar(await) listener: endMetadataStar(0) 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 1f67238cbf3a..04e3dcc94f38 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 @@ -875,8 +875,8 @@ parseUnit(class) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -1636,8 +1636,8 @@ parseUnit(class) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -2242,8 +2242,8 @@ parseUnit(class) listener: beginDoWhileStatementBody(() parseStatement(do) parseStatementX(do) - parseExpressionStatementOrDeclaration(do, false) - parseExpressionStatementOrDeclarationAfterModifiers(do, do, null, null, null, false) + parseExpressionStatementOrDeclaration(do, null) + parseExpressionStatementOrDeclarationAfterModifiers(do, do, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(do) parseExpression(do) @@ -2583,8 +2583,8 @@ parseUnit(class) notEofOrValue(}, else) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(else) parseExpressionStatement(;) parseExpression(;) @@ -2613,8 +2613,8 @@ parseUnit(class) notEofOrValue(}, () parseStatement(else) parseStatementX(else) - parseExpressionStatementOrDeclaration(else, false) - parseExpressionStatementOrDeclarationAfterModifiers(else, else, null, null, null, false) + parseExpressionStatementOrDeclaration(else, null) + parseExpressionStatementOrDeclarationAfterModifiers(else, else, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(else) parseExpression(else) @@ -3791,7 +3791,7 @@ parseUnit(class) notEofOrValue(}, final) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(final, ;, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, ;, null, final, null, null) looksLikeLocalFunction(() listener: beginMetadataStar(final) listener: endMetadataStar(0) @@ -3816,7 +3816,7 @@ parseUnit(class) notEofOrValue(}, x) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement(;) parseExpression(;) @@ -3847,8 +3847,8 @@ parseUnit(class) notEofOrValue(}, )) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction()) parseExpressionStatement(;) parseExpression(;) @@ -3876,8 +3876,8 @@ parseUnit(class) notEofOrValue(}, +) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -4179,9 +4179,9 @@ parseUnit(class) parseStatementX(;) parseForStatement(;, null) listener: beginForStatement(for) - parseForLoopPartsStart(null, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, true) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, ForPartsContext(null)) parseForLoopPartsMid((, null, for) parseExpression(() parsePrecedenceExpression((, 1, true) @@ -4235,8 +4235,8 @@ parseUnit(class) listener: beginForStatementBody(+) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -4853,8 +4853,8 @@ parseUnit(class) listener: beginThenStatement(+) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -5756,8 +5756,8 @@ parseUnit(class) notEofOrValue(}, +) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement(;) parseExpression(;) @@ -8861,8 +8861,8 @@ parseUnit(class) notEofOrValue(}, +) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement(}) parseExpression(}) @@ -9624,8 +9624,8 @@ parseUnit(class) notEofOrValue(}, () parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(}) parseExpression(}) @@ -9934,7 +9934,7 @@ parseUnit(class) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(() listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -9959,7 +9959,7 @@ parseUnit(class) notEofOrValue(}, x) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement(;) parseExpression(;) @@ -9990,8 +9990,8 @@ parseUnit(class) notEofOrValue(}, )) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction()) parseExpressionStatement(;) parseExpression(;) @@ -10019,8 +10019,8 @@ parseUnit(class) notEofOrValue(}, +) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -10173,8 +10173,8 @@ parseUnit(class) notEofOrValue(}, void) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() listener: beginMetadataStar(void) listener: endMetadataStar(0) @@ -10199,7 +10199,7 @@ parseUnit(class) notEofOrValue(}, x) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement(;) parseExpression(;) @@ -10230,8 +10230,8 @@ parseUnit(class) notEofOrValue(}, )) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction()) parseExpressionStatement(;) parseExpression(;) @@ -10259,8 +10259,8 @@ parseUnit(class) notEofOrValue(}, +) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -10442,8 +10442,8 @@ parseUnit(class) listener: beginWhileStatementBody(+) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_top_level_methods.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_top_level_methods.dart.intertwined.expect index 7360e53871ef..754222008579 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_top_level_methods.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_top_level_methods.dart.intertwined.expect @@ -828,8 +828,8 @@ parseUnit(int) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -1569,8 +1569,8 @@ parseUnit(int) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -2159,8 +2159,8 @@ parseUnit(int) listener: beginDoWhileStatementBody(() parseStatement(do) parseStatementX(do) - parseExpressionStatementOrDeclaration(do, false) - parseExpressionStatementOrDeclarationAfterModifiers(do, do, null, null, null, false) + parseExpressionStatementOrDeclaration(do, null) + parseExpressionStatementOrDeclarationAfterModifiers(do, do, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(do) parseExpression(do) @@ -2492,8 +2492,8 @@ parseUnit(int) notEofOrValue(}, else) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(else) parseExpressionStatement(;) parseExpression(;) @@ -2522,8 +2522,8 @@ parseUnit(int) notEofOrValue(}, () parseStatement(else) parseStatementX(else) - parseExpressionStatementOrDeclaration(else, false) - parseExpressionStatementOrDeclarationAfterModifiers(else, else, null, null, null, false) + parseExpressionStatementOrDeclaration(else, null) + parseExpressionStatementOrDeclarationAfterModifiers(else, else, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(else) parseExpression(else) @@ -3668,7 +3668,7 @@ parseUnit(int) notEofOrValue(}, final) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(final, ;, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, ;, null, final, null, null) looksLikeLocalFunction(() listener: beginMetadataStar(final) listener: endMetadataStar(0) @@ -3693,7 +3693,7 @@ parseUnit(int) notEofOrValue(}, x) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement(;) parseExpression(;) @@ -3724,8 +3724,8 @@ parseUnit(int) notEofOrValue(}, )) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction()) parseExpressionStatement(;) parseExpression(;) @@ -3753,8 +3753,8 @@ parseUnit(int) notEofOrValue(}, +) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -4048,9 +4048,9 @@ parseUnit(int) parseStatementX(;) parseForStatement(;, null) listener: beginForStatement(for) - parseForLoopPartsStart(null, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, true) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, ForPartsContext(null)) parseForLoopPartsMid((, null, for) parseExpression(() parsePrecedenceExpression((, 1, true) @@ -4104,8 +4104,8 @@ parseUnit(int) listener: beginForStatementBody(+) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -4705,8 +4705,8 @@ parseUnit(int) listener: beginThenStatement(+) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -5584,8 +5584,8 @@ parseUnit(int) notEofOrValue(}, +) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement(;) parseExpression(;) @@ -8577,8 +8577,8 @@ parseUnit(int) notEofOrValue(}, +) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement(}) parseExpression(}) @@ -9295,8 +9295,8 @@ parseUnit(int) notEofOrValue(}, () parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(}) parseExpression(}) @@ -9597,7 +9597,7 @@ parseUnit(int) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(() listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -9622,7 +9622,7 @@ parseUnit(int) notEofOrValue(}, x) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement(;) parseExpression(;) @@ -9653,8 +9653,8 @@ parseUnit(int) notEofOrValue(}, )) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction()) parseExpressionStatement(;) parseExpression(;) @@ -9682,8 +9682,8 @@ parseUnit(int) notEofOrValue(}, +) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -9832,8 +9832,8 @@ parseUnit(int) notEofOrValue(}, void) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() listener: beginMetadataStar(void) listener: endMetadataStar(0) @@ -9858,7 +9858,7 @@ parseUnit(int) notEofOrValue(}, x) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement(;) parseExpression(;) @@ -9889,8 +9889,8 @@ parseUnit(int) notEofOrValue(}, )) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction()) parseExpressionStatement(;) parseExpression(;) @@ -9918,8 +9918,8 @@ parseUnit(int) notEofOrValue(}, +) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) @@ -10097,8 +10097,8 @@ parseUnit(int) listener: beginWhileStatementBody(+) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(+) parseExpressionStatement()) parseExpression()) diff --git a/pkg/front_end/parser_testcases/error_recovery/symbols.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/symbols.dart.intertwined.expect index 50019dd9358e..5223cb1cd3ac 100644 --- a/pkg/front_end/parser_testcases/error_recovery/symbols.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/symbols.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement({) parseExpression({) @@ -46,8 +46,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -74,8 +74,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -96,8 +96,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -116,8 +116,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -136,8 +136,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -156,8 +156,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -176,8 +176,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -196,8 +196,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -216,8 +216,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -236,8 +236,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -256,8 +256,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -276,8 +276,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -296,8 +296,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -316,8 +316,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -336,8 +336,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -356,8 +356,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -376,8 +376,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -396,8 +396,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -416,8 +416,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -436,8 +436,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -456,8 +456,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -476,8 +476,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -496,8 +496,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -516,8 +516,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -536,8 +536,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -556,8 +556,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -576,8 +576,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -596,8 +596,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -616,8 +616,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -636,8 +636,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -656,8 +656,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -676,8 +676,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -696,8 +696,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -716,8 +716,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -736,8 +736,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -758,8 +758,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -780,8 +780,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -802,8 +802,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -824,8 +824,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -846,8 +846,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -868,8 +868,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -890,8 +890,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -912,8 +912,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -934,8 +934,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -956,8 +956,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -978,8 +978,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1000,8 +1000,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1022,8 +1022,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1044,8 +1044,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1066,8 +1066,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1088,8 +1088,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1110,8 +1110,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1132,8 +1132,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1154,8 +1154,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1176,8 +1176,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1198,8 +1198,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1220,8 +1220,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1242,8 +1242,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1264,8 +1264,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1286,8 +1286,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1308,8 +1308,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1330,8 +1330,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1352,8 +1352,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1374,8 +1374,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1396,8 +1396,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1418,8 +1418,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1440,8 +1440,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1462,8 +1462,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1484,8 +1484,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1506,8 +1506,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1528,8 +1528,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1550,8 +1550,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1572,8 +1572,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1594,8 +1594,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1616,8 +1616,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1638,8 +1638,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1660,8 +1660,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1682,8 +1682,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1704,8 +1704,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1726,8 +1726,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1748,8 +1748,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1770,8 +1770,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1792,8 +1792,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1814,8 +1814,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1836,8 +1836,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1858,8 +1858,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1880,8 +1880,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1902,8 +1902,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1924,8 +1924,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1946,8 +1946,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1968,8 +1968,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -1990,8 +1990,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -2012,8 +2012,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -2034,8 +2034,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -2056,8 +2056,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -2078,8 +2078,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -2100,8 +2100,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) @@ -2122,8 +2122,8 @@ parseUnit(main) notEofOrValue(}, #) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(#) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/error_recovery/utf_16_le_content.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/utf_16_le_content.crash_dart.intertwined.expect index 35df62b894c9..ac90ea4d3e01 100644 --- a/pkg/front_end/parser_testcases/error_recovery/utf_16_le_content.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/utf_16_le_content.crash_dart.intertwined.expect @@ -2259,7 +2259,7 @@ parseUnit(EncodingErrorToken()) notEofOrValue(}, p) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(r) listener: beginMetadataStar(p) listener: endMetadataStar(0) @@ -2283,7 +2283,7 @@ parseUnit(EncodingErrorToken()) notEofOrValue(}, i) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(n) listener: beginMetadataStar(i) listener: endMetadataStar(0) @@ -2307,7 +2307,7 @@ parseUnit(EncodingErrorToken()) notEofOrValue(}, t) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(t) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/general/assignment.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/assignment.dart.intertwined.expect index 0005bed15e70..72f3f280cbf6 100644 --- a/pkg/front_end/parser_testcases/general/assignment.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/assignment.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement({) parseExpression({) 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 1a3fb520e35a..3a018c9d3565 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 @@ -51,7 +51,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -77,8 +77,8 @@ parseUnit(augment) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -145,7 +145,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(int) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -169,7 +169,7 @@ parseUnit(augment) notEofOrValue(}, local) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(local) parseExpressionStatement(;) parseExpression(;) @@ -190,7 +190,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(augment) parseExpressionStatement(;) parseExpression(;) @@ -416,7 +416,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -442,8 +442,8 @@ parseUnit(augment) notEofOrValue(}, [) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction([) parseExpressionStatement(;) parseExpression(;) @@ -485,7 +485,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -549,7 +549,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -575,8 +575,8 @@ parseUnit(augment) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -593,7 +593,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -616,7 +616,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(int) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -640,7 +640,7 @@ parseUnit(augment) notEofOrValue(}, local) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(local) parseExpressionStatement(;) parseExpression(;) @@ -661,7 +661,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(augment) parseExpressionStatement(;) parseExpression(;) @@ -782,7 +782,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -808,8 +808,8 @@ parseUnit(augment) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -880,7 +880,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(int) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -904,7 +904,7 @@ parseUnit(augment) notEofOrValue(}, local) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(local) parseExpressionStatement(;) parseExpression(;) @@ -925,7 +925,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(augment) parseExpressionStatement(;) parseExpression(;) @@ -995,7 +995,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -1021,8 +1021,8 @@ parseUnit(augment) notEofOrValue(}, ++) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(++) parseExpressionStatement(;) parseExpression(;) @@ -1048,8 +1048,8 @@ parseUnit(augment) notEofOrValue(}, --) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(--) parseExpressionStatement(;) parseExpression(;) @@ -1076,8 +1076,8 @@ parseUnit(augment) notEofOrValue(}, super) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(super) parseExpressionStatement(;) parseExpression(;) @@ -1118,8 +1118,8 @@ parseUnit(augment) notEofOrValue(}, super) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(super) parseExpressionStatement(;) parseExpression(;) @@ -1199,7 +1199,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -1267,7 +1267,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -1293,8 +1293,8 @@ parseUnit(augment) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -1311,7 +1311,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(super) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -1334,7 +1334,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(int) listener: beginMetadataStar(augment) listener: endMetadataStar(0) @@ -1358,7 +1358,7 @@ parseUnit(augment) notEofOrValue(}, local) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(local) parseExpressionStatement(;) parseExpression(;) @@ -1379,7 +1379,7 @@ parseUnit(augment) notEofOrValue(}, augment) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(augment) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block.dart.intertwined.expect index 84387f2d9832..8ad2bfa50c34 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block.dart.intertwined.expect @@ -87,8 +87,8 @@ parseUnit(void) notEofOrValue(}, on) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(on) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block2.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block2.dart.intertwined.expect index c07d0c68c932..3208d4e37b6b 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block2.dart.intertwined.expect @@ -87,8 +87,8 @@ parseUnit(void) notEofOrValue(}, on) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(on) listener: beginMetadataStar(on) listener: endMetadataStar(0) @@ -134,8 +134,8 @@ parseUnit(void) notEofOrValue(}, on) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(on) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block2_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block2_prime.dart.intertwined.expect index f97eb71ad8e9..e294ba233336 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block2_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block2_prime.dart.intertwined.expect @@ -87,7 +87,7 @@ parseUnit(void) notEofOrValue(}, onX) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(onX) listener: beginMetadataStar(onX) listener: endMetadataStar(0) @@ -132,7 +132,7 @@ parseUnit(void) notEofOrValue(}, onX) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(onX) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block3.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block3.dart.intertwined.expect index d3369330eb0d..f51d4861f6a1 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block3.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block3.dart.intertwined.expect @@ -100,8 +100,8 @@ parseUnit(void) notEofOrValue(}, on) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(on) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block3_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block3_prime.dart.intertwined.expect index 610ebd6f697c..9ef1f008c4d2 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block3_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block3_prime.dart.intertwined.expect @@ -99,7 +99,7 @@ parseUnit(void) notEofOrValue(}, onX) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(onX) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block4.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block4.dart.intertwined.expect index e47aced1cf11..cf1839fdbff2 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block4.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block4.dart.intertwined.expect @@ -100,8 +100,8 @@ parseUnit(void) notEofOrValue(}, on) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(on) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block4_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block4_prime.dart.intertwined.expect index f7336c48d118..fc2c38ff0fb0 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block4_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block4_prime.dart.intertwined.expect @@ -99,7 +99,7 @@ parseUnit(void) notEofOrValue(}, onX) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(onX) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block5.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block5.dart.intertwined.expect index 1c3467cbb1d3..1be440344c69 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block5.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block5.dart.intertwined.expect @@ -100,8 +100,8 @@ parseUnit(void) notEofOrValue(}, on) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(on) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block5_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block5_prime.dart.intertwined.expect index de467a3115b2..52a2ffb453d7 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block5_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block5_prime.dart.intertwined.expect @@ -99,7 +99,7 @@ parseUnit(void) notEofOrValue(}, onX) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(onX) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/call_on_after_try_block_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/call_on_after_try_block_prime.dart.intertwined.expect index b7b15a21c668..6432eec8abde 100644 --- a/pkg/front_end/parser_testcases/general/call_on_after_try_block_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/call_on_after_try_block_prime.dart.intertwined.expect @@ -87,7 +87,7 @@ parseUnit(void) notEofOrValue(}, onX) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(onX) parseExpressionStatement(}) parseExpression(}) diff --git a/pkg/front_end/parser_testcases/general/chained_call_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/chained_call_01.dart.intertwined.expect index fce21baebaf8..ab0987921901 100644 --- a/pkg/front_end/parser_testcases/general/chained_call_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/chained_call_01.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/chained_call_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/chained_call_02.dart.intertwined.expect index 9579bc059aef..b701a3421b3c 100644 --- a/pkg/front_end/parser_testcases/general/chained_call_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/chained_call_02.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/chained_call_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/chained_call_03.dart.intertwined.expect index 48074431ea46..29a09de6f802 100644 --- a/pkg/front_end/parser_testcases/general/chained_call_03.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/chained_call_03.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/chained_call_04.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/chained_call_04.dart.intertwined.expect index cf46e41b22d6..a3d0c087456e 100644 --- a/pkg/front_end/parser_testcases/general/chained_call_04.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/chained_call_04.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/chained_call_05.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/chained_call_05.dart.intertwined.expect index e0381e7b51a3..f7753b8bc680 100644 --- a/pkg/front_end/parser_testcases/general/chained_call_05.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/chained_call_05.dart.intertwined.expect @@ -40,8 +40,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/chained_call_06.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/chained_call_06.dart.intertwined.expect index ac7ecb668f3c..f3d1fd647e2b 100644 --- a/pkg/front_end/parser_testcases/general/chained_call_06.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/chained_call_06.dart.intertwined.expect @@ -40,8 +40,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/chained_call_07.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/chained_call_07.dart.intertwined.expect index 9129a71aac16..526bd00f0a4f 100644 --- a/pkg/front_end/parser_testcases/general/chained_call_07.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/chained_call_07.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/for.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/for.dart.intertwined.expect index e71f83654519..007c4845a2e0 100644 --- a/pkg/front_end/parser_testcases/general/for.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/for.dart.intertwined.expect @@ -31,9 +31,9 @@ parseUnit(main) parseStatementX({) parseForStatement({, null) listener: beginForStatement(for) - parseForLoopPartsStart(null, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, true) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, ForPartsContext(null)) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: handleIdentifier(int, typeReference) diff --git a/pkg/front_end/parser_testcases/general/for_in.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/for_in.dart.intertwined.expect index c58995cb530d..937b10b4bb1d 100644 --- a/pkg/front_end/parser_testcases/general/for_in.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/for_in.dart.intertwined.expect @@ -31,9 +31,9 @@ parseUnit(main) parseStatementX({) parseForStatement({, null) listener: beginForStatement(for) - parseForLoopPartsStart(null, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers(var, (, null, var, null, true) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers(var, (, null, var, null, ForPartsContext(null)) listener: beginMetadataStar(var) listener: endMetadataStar(0) listener: handleNoType(var) diff --git a/pkg/front_end/parser_testcases/general/for_in_no_decl.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/for_in_no_decl.dart.intertwined.expect index 4fea17d9e5c4..762a4800b9d4 100644 --- a/pkg/front_end/parser_testcases/general/for_in_no_decl.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/for_in_no_decl.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(i) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -50,9 +50,9 @@ parseUnit(main) parseStatementX(;) parseForStatement(;, null) listener: beginForStatement(for) - parseForLoopPartsStart(null, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, true) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, ForPartsContext(null)) parseForLoopPartsMid((, null, for) parseExpression(() parsePrecedenceExpression((, 1, true) diff --git a/pkg/front_end/parser_testcases/general/for_no_decl.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/for_no_decl.dart.intertwined.expect index 07adb6d5b2d1..8263197dd577 100644 --- a/pkg/front_end/parser_testcases/general/for_no_decl.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/for_no_decl.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(i) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -52,9 +52,9 @@ parseUnit(main) parseStatementX(;) parseForStatement(;, null) listener: beginForStatement(for) - parseForLoopPartsStart(null, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, true) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, ForPartsContext(null)) parseForLoopPartsMid((, null, for) parseExpression(() parsePrecedenceExpression((, 1, true) diff --git a/pkg/front_end/parser_testcases/general/function_declaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/function_declaration.dart.intertwined.expect index 141375902b98..22b22dc7a892 100644 --- a/pkg/front_end/parser_testcases/general/function_declaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/function_declaration.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, local) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(local) listener: beginMetadataStar(local) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/general/function_expression.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/function_expression.dart.intertwined.expect index 1cb2ded96c02..5b4e3bf03a1d 100644 --- a/pkg/front_end/parser_testcases/general/function_expression.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/function_expression.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45120.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45120.dart.intertwined.expect index b4631e2c30e7..7a2569a63ab6 100644 --- a/pkg/front_end/parser_testcases/general/issue_45120.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45120.dart.intertwined.expect @@ -172,7 +172,7 @@ parseUnit(@) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -198,7 +198,7 @@ parseUnit(@) listener: endArguments(1, (, )) listener: endMetadata(@, null, void) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(), {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(), {, null, null, null, null) looksLikeLocalFunction(f) listener: beginFunctionType(void) listener: beginTypeVariables(<) 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 ef31b0429ecc..b914ab366a2f 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 @@ -269,8 +269,8 @@ parseUnit(class) notEofOrValue(}, Function) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(ok) listener: beginMetadataStar(Function) listener: endMetadataStar(0) @@ -291,8 +291,8 @@ parseUnit(class) notEofOrValue(}, dynamic) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(okToo) listener: beginMetadataStar(dynamic) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_01.dart.intertwined.expect index 16cf5a736f93..87b74a9270e2 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_01.dart.intertwined.expect @@ -52,7 +52,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -173,7 +173,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -291,7 +291,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_01_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_01_prime.dart.intertwined.expect index 4c8a941999be..c3ca3d303312 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_01_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_01_prime.dart.intertwined.expect @@ -52,7 +52,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -173,7 +173,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -300,7 +300,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_02.dart.intertwined.expect index a5f25b78bf1f..b3f8fb2db330 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_02.dart.intertwined.expect @@ -52,7 +52,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -173,7 +173,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -292,7 +292,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_02_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_02_prime.dart.intertwined.expect index 9fccf81c58a1..f1f40c1882e1 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_02_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_02_prime.dart.intertwined.expect @@ -52,7 +52,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -173,7 +173,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -300,7 +300,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_03.dart.intertwined.expect index f4edee72f6e6..5b8efa6a47ed 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_03.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_03.dart.intertwined.expect @@ -52,7 +52,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -185,7 +185,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -329,7 +329,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_03_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_03_prime.dart.intertwined.expect index 37ea9f9022df..b8a744605f84 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_03_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_03_prime.dart.intertwined.expect @@ -52,7 +52,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -185,7 +185,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -337,7 +337,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_04.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_04.dart.intertwined.expect index c2d87c4f1208..bb3a329f8c62 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_04.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_04.dart.intertwined.expect @@ -63,7 +63,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_04_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_04_prime.dart.intertwined.expect index 31583f3e8a48..f10256233db1 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_04_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_04_prime.dart.intertwined.expect @@ -63,7 +63,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_05.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_05.dart.intertwined.expect index 75525e9288f6..d2f502905998 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_05.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_05.dart.intertwined.expect @@ -52,7 +52,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -185,7 +185,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -332,7 +332,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -422,7 +422,7 @@ parseUnit(void) notEofOrValue(}, g1) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g1) parseExpressionStatement({) parseExpression({) @@ -471,7 +471,7 @@ parseUnit(void) notEofOrValue(}, g2) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(g2) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect index e7e65a4ea074..ac9b4860b7a1 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect @@ -52,7 +52,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -184,7 +184,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -293,7 +293,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_07.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_07.dart.intertwined.expect index 98b901466e95..a360e74a4b07 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_07.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_07.dart.intertwined.expect @@ -52,7 +52,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -209,7 +209,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement({) parseExpression({) @@ -332,7 +332,7 @@ parseUnit(void) notEofOrValue(}, g) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(g) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_47008_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_47008_01.dart.intertwined.expect index 02414f375ef5..ab5fbf780871 100644 --- a/pkg/front_end/parser_testcases/general/issue_47008_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_47008_01.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, a) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_47008_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_47008_02.dart.intertwined.expect index bd6c9709cc82..8d6d4c3acb33 100644 --- a/pkg/front_end/parser_testcases/general/issue_47008_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_47008_02.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, a) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_47009_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_47009_01.dart.intertwined.expect index e823422bc21d..d1b5921aecba 100644 --- a/pkg/front_end/parser_testcases/general/issue_47009_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_47009_01.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, a) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_47009_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_47009_02.dart.intertwined.expect index c97747bea74b..db0cda0ade2a 100644 --- a/pkg/front_end/parser_testcases/general/issue_47009_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_47009_02.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, a) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/issue_47009_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_47009_03.dart.intertwined.expect index 2c56e4e82e62..bf2114aeb6e5 100644 --- a/pkg/front_end/parser_testcases/general/issue_47009_03.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_47009_03.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, a) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/missing_end_bracket.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/missing_end_bracket.dart.intertwined.expect index 2fec437122a9..b481b7a6c132 100644 --- a/pkg/front_end/parser_testcases/general/missing_end_bracket.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/missing_end_bracket.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(UnmatchedToken({)) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/general/toplevel_get_called_get.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/toplevel_get_called_get.dart.intertwined.expect index a37da3fa7761..27765ccc3375 100644 --- a/pkg/front_end/parser_testcases/general/toplevel_get_called_get.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/toplevel_get_called_get.dart.intertwined.expect @@ -65,8 +65,8 @@ parseUnit(dynamic) notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -149,8 +149,8 @@ parseUnit(dynamic) notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -234,8 +234,8 @@ parseUnit(dynamic) notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -319,8 +319,8 @@ parseUnit(dynamic) notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/chained_call_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/chained_call_01.dart.intertwined.expect index 96a8d679a082..29edd5a08ecd 100644 --- a/pkg/front_end/parser_testcases/nnbd/chained_call_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/chained_call_01.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/chained_call_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/chained_call_02.dart.intertwined.expect index 115149e667d7..3dd4671b2142 100644 --- a/pkg/front_end/parser_testcases/nnbd/chained_call_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/chained_call_02.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/chained_call_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/chained_call_03.dart.intertwined.expect index 69052ee2dad2..cadd54ffcc9f 100644 --- a/pkg/front_end/parser_testcases/nnbd/chained_call_03.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/chained_call_03.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/chained_call_04.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/chained_call_04.dart.intertwined.expect index 5a3d80bd8a02..5971d1e1df5e 100644 --- a/pkg/front_end/parser_testcases/nnbd/chained_call_04.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/chained_call_04.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/chained_call_05.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/chained_call_05.dart.intertwined.expect index 668b441e538d..d54a62167620 100644 --- a/pkg/front_end/parser_testcases/nnbd/chained_call_05.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/chained_call_05.dart.intertwined.expect @@ -40,8 +40,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) @@ -92,8 +92,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/chained_call_06.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/chained_call_06.dart.intertwined.expect index e6a48a41ef5f..ed97a487d10e 100644 --- a/pkg/front_end/parser_testcases/nnbd/chained_call_06.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/chained_call_06.dart.intertwined.expect @@ -40,8 +40,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) @@ -99,8 +99,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/chained_call_07.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/chained_call_07.dart.intertwined.expect index f87b938a7b08..0d9261a3fe3e 100644 --- a/pkg/front_end/parser_testcases/nnbd/chained_call_07.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/chained_call_07.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/chained_call_08.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/chained_call_08.dart.intertwined.expect index 100b30bb2b88..430fd1af4490 100644 --- a/pkg/front_end/parser_testcases/nnbd/chained_call_08.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/chained_call_08.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/chained_call_with_index_01.dart.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/chained_call_with_index_01.dart.dart.intertwined.expect index 03b5b3a8d1ec..ead9c0cd3752 100644 --- a/pkg/front_end/parser_testcases/nnbd/chained_call_with_index_01.dart.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/chained_call_with_index_01.dart.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) @@ -99,7 +99,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement(;) parseExpression(;) 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 dc08aae9fbb7..b3436faf7fe2 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 @@ -28,8 +28,8 @@ parseUnit(void) notEofOrValue(}, late) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers(late, {, late, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers(late, {, late, null, null, null) looksLikeLocalFunction(x) reportRecoverableError(x, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, x, x) @@ -140,8 +140,8 @@ parseUnit(void) notEofOrValue(}, late) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers(late, {, late, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers(late, {, late, null, null, null) looksLikeLocalFunction(x) reportRecoverableError(x, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, x, x) @@ -192,8 +192,8 @@ parseUnit(void) notEofOrValue(}, late) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers(late, {, late, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers(late, {, late, null, null, null) looksLikeLocalFunction(x) reportRecoverableError(x, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, x, x) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39286.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39286.dart.intertwined.expect index f18ffcfa3921..aff6babe9a02 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39286.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39286.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, x) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39286_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39286_2.dart.intertwined.expect index 66561d9ca7e1..ded0c9c731cf 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39286_2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39286_2.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, x) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39286_2_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39286_2_prime.dart.intertwined.expect index c16692e37dc3..d53d81c50d1c 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39286_2_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39286_2_prime.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, x) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39286_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39286_prime.dart.intertwined.expect index 7a91e019c632..4fa031c07b43 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39286_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39286_prime.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, x) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39326.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39326.dart.intertwined.expect index fa230b598046..c9ecdbc264ba 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39326.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39326.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(c) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -48,7 +48,7 @@ parseUnit(main) notEofOrValue(}, c) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c) parseExpressionStatement(;) parseExpression(;) @@ -86,7 +86,7 @@ parseUnit(main) notEofOrValue(}, c) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c) parseExpressionStatement(;) parseExpression(;) @@ -136,7 +136,7 @@ parseUnit(main) notEofOrValue(}, c) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c) parseExpressionStatement(;) parseExpression(;) 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 fb7c53efe95d..f209ebd0b3fb 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 @@ -112,7 +112,7 @@ parseUnit(class) notEofOrValue(}, A) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(a) parseExpressionWithoutCascade(=) parsePrecedenceExpression(=, 1, false) @@ -145,7 +145,7 @@ parseUnit(class) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -182,7 +182,7 @@ parseUnit(class) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -215,7 +215,7 @@ parseUnit(class) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -256,7 +256,7 @@ parseUnit(class) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) 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 7de025f50c00..a77cb8be0b40 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 @@ -112,7 +112,7 @@ parseUnit(class) notEofOrValue(}, A) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(a) parseExpressionWithoutCascade(=) parsePrecedenceExpression(=, 1, false) @@ -145,8 +145,8 @@ parseUnit(class) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -192,8 +192,8 @@ parseUnit(class) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -235,8 +235,8 @@ parseUnit(class) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -286,8 +286,8 @@ parseUnit(class) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39776.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39776.dart.intertwined.expect index 65acccaeaa23..9fc11b26888c 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39776.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39776.dart.intertwined.expect @@ -135,8 +135,8 @@ parseUnit(Object) notEofOrValue(}, Function) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f1) parseExpressionWithoutCascade(=) parsePrecedenceExpression(=, 1, false) @@ -180,7 +180,7 @@ parseUnit(Object) notEofOrValue(}, f1) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f1) parseExpressionStatement(;) parseExpression(;) @@ -215,8 +215,8 @@ parseUnit(Object) notEofOrValue(}, Function) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f2) listener: beginMetadataStar(Function) listener: endMetadataStar(0) @@ -251,7 +251,7 @@ parseUnit(Object) notEofOrValue(}, f2) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f2) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39776_prime1.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39776_prime1.dart.intertwined.expect index 5381dd5dd0fb..0fa70fa1bf7b 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39776_prime1.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39776_prime1.dart.intertwined.expect @@ -135,8 +135,8 @@ parseUnit(Object) notEofOrValue(}, Function) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f1) parseExpressionWithoutCascade(=) parsePrecedenceExpression(=, 1, false) @@ -180,7 +180,7 @@ parseUnit(Object) notEofOrValue(}, f1) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f1) parseExpressionStatement(;) parseExpression(;) @@ -215,8 +215,8 @@ parseUnit(Object) notEofOrValue(}, Function) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f2) listener: beginMetadataStar(Function) listener: endMetadataStar(0) @@ -251,7 +251,7 @@ parseUnit(Object) notEofOrValue(}, f2) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f2) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39776_prime2.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39776_prime2.dart.intertwined.expect index 89c83103149b..c71bafd95841 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39776_prime2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39776_prime2.dart.intertwined.expect @@ -135,8 +135,8 @@ parseUnit(Object) notEofOrValue(}, Function) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f1) parseExpressionWithoutCascade(=) parsePrecedenceExpression(=, 1, false) @@ -180,7 +180,7 @@ parseUnit(Object) notEofOrValue(}, f1) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f1) parseExpressionStatement(;) parseExpression(;) @@ -215,8 +215,8 @@ parseUnit(Object) notEofOrValue(}, Function) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f2) listener: beginMetadataStar(Function) listener: endMetadataStar(0) @@ -251,8 +251,8 @@ parseUnit(Object) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39776_prime3.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39776_prime3.dart.intertwined.expect index dbdb47c9a17d..cedc2b94b193 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39776_prime3.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39776_prime3.dart.intertwined.expect @@ -107,8 +107,8 @@ parseUnit(Object) notEofOrValue(}, Function) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f2) listener: beginMetadataStar(Function) listener: endMetadataStar(0) @@ -143,7 +143,7 @@ parseUnit(Object) notEofOrValue(}, f2) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f2) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39776_prime4.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39776_prime4.dart.intertwined.expect index 598888b6deb5..f15d0ca9f76e 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39776_prime4.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39776_prime4.dart.intertwined.expect @@ -107,8 +107,8 @@ parseUnit(Object) notEofOrValue(}, Function) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f2) listener: beginMetadataStar(Function) listener: endMetadataStar(0) @@ -143,7 +143,7 @@ parseUnit(Object) notEofOrValue(}, f2) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f2) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.intertwined.expect index 749246b9c040..58b5def546df 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.intertwined.expect @@ -136,7 +136,7 @@ parseUnit(main) listener: beginSwitchCase(0, 1, case) parseStatement(:) parseStatementX(:) - parseExpressionStatementOrDeclarationAfterModifiers(:, :, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(:, :, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement(:) parseExpression(:) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.intertwined.expect index 5aadbccbb0d5..e7a2d24ae18a 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.intertwined.expect @@ -132,8 +132,8 @@ parseUnit(main) notEofOrValue(}, 2) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(2) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_conditional.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_conditional.dart.intertwined.expect index 6eaf362ee8f0..23116f8ba394 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_conditional.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_conditional.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(a) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -62,7 +62,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -145,7 +145,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -228,7 +228,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -335,7 +335,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -442,7 +442,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -518,7 +518,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_conditional_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_conditional_2.dart.intertwined.expect index 42f9b1cd4ecc..1d255eaeba14 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_conditional_2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_conditional_2.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(a) listener: beginMetadataStar(var) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_index_access.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_index_access.dart.intertwined.expect index f9de6bfa247a..4ab77f1863cf 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_index_access.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_index_access.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(a) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -55,7 +55,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -94,7 +94,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -145,7 +145,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_index_set.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_index_set.dart.intertwined.expect index 4bd6584d1c05..bac80603114c 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_index_set.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_index_set.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(a) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -62,7 +62,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -114,7 +114,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -186,7 +186,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_lookup_plus.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_lookup_plus.dart.intertwined.expect index 7d451f61ebd9..80ae21e603b7 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_lookup_plus.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_lookup_plus.dart.intertwined.expect @@ -41,7 +41,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_lookup_plus_plus.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_lookup_plus_plus.dart.intertwined.expect index 040e0e18976d..ca92806c599a 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_lookup_plus_plus.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_lookup_plus_plus.dart.intertwined.expect @@ -53,7 +53,7 @@ parseUnit(f) notEofOrValue(}, x) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(x) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_method_call_no_type_arguments.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_method_call_no_type_arguments.dart.intertwined.expect index e1fdd25bbc79..c117b4f0373f 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_method_call_no_type_arguments.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_method_call_no_type_arguments.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(a) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -55,7 +55,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -104,7 +104,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_method_call_with_type_arguments.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_method_call_with_type_arguments.dart.intertwined.expect index 757897001516..325227ad7a10 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_method_call_with_type_arguments.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_method_call_with_type_arguments.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(a) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -55,7 +55,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -108,7 +108,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_plus_plus_lookup.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_plus_plus_lookup.dart.intertwined.expect index e73d955e2e86..282b834bf9a3 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40267_plus_plus_lookup.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_plus_plus_lookup.dart.intertwined.expect @@ -53,8 +53,8 @@ parseUnit(f) notEofOrValue(}, ++) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(++) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40793.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40793.dart.intertwined.expect index e64fbe606e4b..0a0075405bab 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40793.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40793.dart.intertwined.expect @@ -87,7 +87,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime.dart.intertwined.expect index 0752d23e6703..90374659f387 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime.dart.intertwined.expect @@ -96,7 +96,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime2.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime2.dart.intertwined.expect index b046ab20fb5f..ab41df2f9ef4 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime2.dart.intertwined.expect @@ -95,7 +95,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime3.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime3.dart.intertwined.expect index 1309826f6e50..1699511bed60 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime3.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime3.dart.intertwined.expect @@ -86,7 +86,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime4.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime4.dart.intertwined.expect index 82eec5f8b1a5..913b436ac49f 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime4.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime4.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime5.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime5.dart.intertwined.expect index 2490973ed6f7..59ff51908573 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40793_prime5.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40793_prime5.dart.intertwined.expect @@ -40,7 +40,7 @@ parseUnit(void) notEofOrValue(}, e) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(e) parseExpressionStatement({) parseExpression({) 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 527f0f799233..0a77e465964c 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 @@ -299,7 +299,7 @@ parseUnit(class) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -440,7 +440,7 @@ parseUnit(class) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_41177.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_41177.dart.intertwined.expect index 7a8c0d1ac48d..709e74003005 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_41177.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_41177.dart.intertwined.expect @@ -57,7 +57,7 @@ parseUnit(main) notEofOrValue(}, a) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement({) parseExpression({) @@ -87,7 +87,7 @@ parseUnit(main) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -127,7 +127,7 @@ parseUnit(main) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -168,8 +168,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -219,7 +219,7 @@ parseUnit(main) notEofOrValue(}, b) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(b) parseExpressionStatement(;) parseExpression(;) @@ -281,8 +281,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) 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 2c125d06a513..1842e16cf0d6 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 @@ -63,7 +63,7 @@ parseUnit(bool) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -101,7 +101,7 @@ parseUnit(bool) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -140,7 +140,7 @@ parseUnit(bool) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_47020.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_47020.dart.intertwined.expect index d6bc6c8bf518..43c140b9c684 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_47020.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_47020.dart.intertwined.expect @@ -28,8 +28,8 @@ parseUnit(void) notEofOrValue(}, Function) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(f) parseExpressionWithoutCascade(=) parsePrecedenceExpression(=, 1, false) @@ -46,7 +46,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -104,7 +104,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -145,7 +145,7 @@ parseUnit(void) notEofOrValue(}, f) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(f) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_48999.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_48999.dart.intertwined.expect index 2b416cea8568..ad876549f676 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_48999.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_48999.dart.intertwined.expect @@ -28,8 +28,8 @@ parseUnit(void) notEofOrValue(}, dynamic) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(i) listener: beginMetadataStar(dynamic) listener: endMetadataStar(0) @@ -57,7 +57,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -115,7 +115,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_48999_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_48999_prime.dart.intertwined.expect index 00f982cb7d4a..9dc35551e57b 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_48999_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_48999_prime.dart.intertwined.expect @@ -28,8 +28,8 @@ parseUnit(void) notEofOrValue(}, dynamic) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(i) listener: beginMetadataStar(dynamic) listener: endMetadataStar(0) @@ -57,7 +57,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -124,7 +124,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49678.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49678.dart.intertwined.expect index 83c9fddd9aa3..f41ebd6d0978 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_49678.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_49678.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(dynamic) notEofOrValue(}, Map) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(m) listener: beginMetadataStar(Map) listener: endMetadataStar(0) @@ -92,7 +92,7 @@ parseUnit(dynamic) notEofOrValue(}, m) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(m) parseExpressionStatement(;) parseExpression(;) @@ -137,7 +137,7 @@ parseUnit(dynamic) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(list) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -230,7 +230,7 @@ parseUnit(dynamic) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(list2) listener: beginMetadataStar(var) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49678_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49678_prime.dart.intertwined.expect index d338d40ffe4d..d3ed1fdcd4f8 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_49678_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_49678_prime.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(dynamic) notEofOrValue(}, Map) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(m) listener: beginMetadataStar(Map) listener: endMetadataStar(0) @@ -92,7 +92,7 @@ parseUnit(dynamic) notEofOrValue(}, m) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(m) parseExpressionStatement(;) parseExpression(;) @@ -146,7 +146,7 @@ parseUnit(dynamic) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(list) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -266,7 +266,7 @@ parseUnit(dynamic) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(list2) listener: beginMetadataStar(var) listener: endMetadataStar(0) 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 bb5c18d456d6..1592e1bf040d 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 @@ -29,8 +29,8 @@ parseUnit(main) notEofOrValue(}, dynamic) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) listener: beginMetadataStar(dynamic) listener: endMetadataStar(0) @@ -72,7 +72,7 @@ parseUnit(main) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(bar) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -118,8 +118,8 @@ parseUnit(main) notEofOrValue(}, late) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(late) parseExpressionStatement(;) parseExpression(;) @@ -146,7 +146,7 @@ parseUnit(main) notEofOrValue(}, bar) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(bar) parseExpressionStatement(;) parseExpression(;) @@ -171,8 +171,8 @@ parseUnit(main) notEofOrValue(}, new) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(new) parseExpressionStatement(;) parseExpression(;) @@ -217,8 +217,8 @@ parseUnit(main) notEofOrValue(}, new) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(new) parseExpressionStatement(;) parseExpression(;) @@ -287,7 +287,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -374,7 +374,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) 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 193c9c2059b7..41f0ea6b69da 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 @@ -29,8 +29,8 @@ parseUnit(main) notEofOrValue(}, dynamic) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) listener: beginMetadataStar(dynamic) listener: endMetadataStar(0) @@ -72,7 +72,7 @@ parseUnit(main) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(bar) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -118,8 +118,8 @@ parseUnit(main) notEofOrValue(}, late) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(late) parseExpressionStatement(;) parseExpression(;) @@ -146,7 +146,7 @@ parseUnit(main) notEofOrValue(}, bar) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(bar) parseExpressionStatement(;) parseExpression(;) @@ -171,8 +171,8 @@ parseUnit(main) notEofOrValue(}, new) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(new) parseExpressionStatement(;) parseExpression(;) @@ -217,8 +217,8 @@ parseUnit(main) notEofOrValue(}, new) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(new) parseExpressionStatement(;) parseExpression(;) @@ -259,8 +259,8 @@ parseUnit(main) notEofOrValue(}, late) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(late, ;, late, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(late, ;, late, null, null, null) looksLikeLocalFunction(foo) listener: beginMetadataStar(late) listener: endMetadataStar(0) @@ -281,7 +281,7 @@ parseUnit(main) notEofOrValue(}, foo) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement(;) parseExpression(;) @@ -336,7 +336,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -423,7 +423,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckBeforeIndex.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckBeforeIndex.dart.intertwined.expect index 5bc11680608f..acdb574eec6b 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckBeforeIndex.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckBeforeIndex.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckBeforeIndex_with_parens.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckBeforeIndex_with_parens.dart.intertwined.expect index 7567372f1ddc..b25bd3a90ea1 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckBeforeIndex_with_parens.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckBeforeIndex_with_parens.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(f) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex.dart.intertwined.expect index 5ed49af2d86f..4ea9042d49ff 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, obj) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(obj) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex2.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex2.dart.intertwined.expect index 28566d112177..dcbbaed0ad26 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex2.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, obj) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(obj) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex2_with_parens.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex2_with_parens.dart.intertwined.expect index 4ec4ae368c3c..60ec194c6ef0 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex2_with_parens.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex2_with_parens.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(f) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex3.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex3.dart.intertwined.expect index 9e58ef9ce197..3cb0239245fb 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex3.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex3.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex3_with_parens.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex3_with_parens.dart.intertwined.expect index 8978dc693e9d..d82b5d8e94f4 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex3_with_parens.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex3_with_parens.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(f) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex4.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex4.dart.intertwined.expect index d0ca72f2afed..008aad647751 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex4.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex4.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex4_with_parens.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex4_with_parens.dart.intertwined.expect index c9540a8d21b7..9121ae0dac57 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex4_with_parens.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex4_with_parens.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(f) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex5.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex5.dart.intertwined.expect index b15f181225cd..0d4ca4e7a0cf 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex5.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex5.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex5_with_parens.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex5_with_parens.dart.intertwined.expect index 05d0b1aef41f..6b2e061faf12 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex5_with_parens.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex5_with_parens.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(f) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex6.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex6.dart.intertwined.expect index bb93a2fba739..14b68ff53b16 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex6.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex6.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex6_with_parens.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex6_with_parens.dart.intertwined.expect index 11bfe25fd356..082a6157e30e 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex6_with_parens.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex6_with_parens.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(f) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex_with_parens.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex_with_parens.dart.intertwined.expect index 92bbb1409266..26bc3e894546 100644 --- a/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex_with_parens.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/nullCheckOnIndex_with_parens.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(f) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) 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 8f2b227e2be9..9c8c949da07c 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 @@ -168,7 +168,7 @@ parseUnit(class) notEofOrValue(}, Class1) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(c1) listener: beginMetadataStar(Class1) listener: endMetadataStar(0) @@ -189,7 +189,7 @@ parseUnit(class) notEofOrValue(}, c1) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c1) parseExpressionStatement(;) parseExpression(;) @@ -221,7 +221,7 @@ parseUnit(class) notEofOrValue(}, c1) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c1) parseExpressionStatement(;) parseExpression(;) @@ -259,7 +259,7 @@ parseUnit(class) notEofOrValue(}, c1) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c1) parseExpressionStatement(;) parseExpression(;) @@ -299,7 +299,7 @@ parseUnit(class) notEofOrValue(}, c1) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c1) parseExpressionStatement(;) parseExpression(;) @@ -349,7 +349,7 @@ parseUnit(class) notEofOrValue(}, c1) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c1) parseExpressionStatement(;) parseExpression(;) @@ -389,7 +389,7 @@ parseUnit(class) notEofOrValue(}, c1) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c1) parseExpressionStatement(;) parseExpression(;) 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 92444e6ca114..8f16f71ba71b 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 @@ -29,8 +29,8 @@ parseUnit(main) notEofOrValue(}, dynamic) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) listener: beginMetadataStar(dynamic) listener: endMetadataStar(0) @@ -72,7 +72,7 @@ parseUnit(main) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(bar) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -118,8 +118,8 @@ parseUnit(main) notEofOrValue(}, required) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(required) parseExpressionStatement(;) parseExpression(;) @@ -146,7 +146,7 @@ parseUnit(main) notEofOrValue(}, bar) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(bar) parseExpressionStatement(;) parseExpression(;) @@ -171,8 +171,8 @@ parseUnit(main) notEofOrValue(}, new) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(new) parseExpressionStatement(;) parseExpression(;) @@ -217,8 +217,8 @@ parseUnit(main) notEofOrValue(}, new) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(new) parseExpressionStatement(;) parseExpression(;) @@ -287,7 +287,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -374,7 +374,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) 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 dfb3b6151a92..547a36958fb4 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 @@ -29,8 +29,8 @@ parseUnit(main) notEofOrValue(}, dynamic) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) listener: beginMetadataStar(dynamic) listener: endMetadataStar(0) @@ -72,7 +72,7 @@ parseUnit(main) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(bar) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -118,8 +118,8 @@ parseUnit(main) notEofOrValue(}, required) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(required) parseExpressionStatement(;) parseExpression(;) @@ -146,7 +146,7 @@ parseUnit(main) notEofOrValue(}, bar) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(bar) parseExpressionStatement(;) parseExpression(;) @@ -171,8 +171,8 @@ parseUnit(main) notEofOrValue(}, new) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(new) parseExpressionStatement(;) parseExpression(;) @@ -217,8 +217,8 @@ parseUnit(main) notEofOrValue(}, new) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(new) parseExpressionStatement(;) parseExpression(;) @@ -303,7 +303,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -390,7 +390,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) 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 62585ef5be82..1eb1da8cdd50 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 @@ -108,7 +108,7 @@ parseUnit(class) notEofOrValue(}, Foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) listener: beginMetadataStar(Foo) listener: endMetadataStar(0) @@ -150,7 +150,7 @@ parseUnit(class) notEofOrValue(}, foo) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement(;) parseExpression(;) @@ -181,7 +181,7 @@ parseUnit(class) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -229,7 +229,7 @@ parseUnit(class) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -336,7 +336,7 @@ parseUnit(class) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) 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 913abe8f09f9..a14bb1184947 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 @@ -105,7 +105,7 @@ parseUnit(class) notEofOrValue(}, Foo) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(foo) listener: beginMetadataStar(Foo) listener: endMetadataStar(0) @@ -147,7 +147,7 @@ parseUnit(class) notEofOrValue(}, foo) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(foo) parseExpressionStatement(;) parseExpression(;) @@ -175,7 +175,7 @@ parseUnit(class) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -220,7 +220,7 @@ parseUnit(class) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -321,7 +321,7 @@ parseUnit(class) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/simple_attempted_usage_of_triple_shift.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/simple_attempted_usage_of_triple_shift.dart.intertwined.expect index 6443acf6a262..cee69599705f 100644 --- a/pkg/front_end/parser_testcases/no-triple-shift/simple_attempted_usage_of_triple_shift.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/no-triple-shift/simple_attempted_usage_of_triple_shift.dart.intertwined.expect @@ -44,7 +44,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(x) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -80,7 +80,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) 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 4f7f7762e22b..5983368345f0 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 @@ -150,7 +150,7 @@ parseUnit(extension) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_symbol.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_symbol.dart.intertwined.expect index e56cb2759c64..19e93538bd1c 100644 --- a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_symbol.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_symbol.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_39326.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_39326.dart.intertwined.expect index d3c8ed1a6611..d3e0dcfc0695 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_39326.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_39326.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(main) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(c) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -48,7 +48,7 @@ parseUnit(main) notEofOrValue(}, c) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(c) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional.dart.intertwined.expect index 6eaf362ee8f0..23116f8ba394 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(a) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -62,7 +62,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -145,7 +145,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -228,7 +228,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -335,7 +335,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -442,7 +442,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) @@ -518,7 +518,7 @@ parseUnit(f) notEofOrValue(}, a) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(a) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_2.dart.intertwined.expect index 42f9b1cd4ecc..1d255eaeba14 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_2.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(a) listener: beginMetadataStar(var) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_3.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_3.dart.intertwined.expect index ce7e5a6f808d..275933635d6c 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_3.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_3.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(a) listener: beginMetadataStar(var) listener: endMetadataStar(0) 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 b9ed1d36e895..9f4528ed856e 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 @@ -181,7 +181,7 @@ parseUnit(int) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(y1) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -202,7 +202,7 @@ parseUnit(int) notEofOrValue(}, late) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) indicatesMethodOrField(;) reportRecoverableErrorWithToken(late, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[UnexpectedModifierInNonNnbd, The modifier 'late' is only available in null safe libraries., null, {lexeme: late}], late, late) @@ -226,7 +226,7 @@ parseUnit(int) notEofOrValue(}, late) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) indicatesMethodOrField(;) reportRecoverableErrorWithToken(late, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[UnexpectedModifierInNonNnbd, The modifier 'late' is only available in null safe libraries., null, {lexeme: late}], late, late) @@ -254,7 +254,7 @@ parseUnit(int) notEofOrValue(}, late) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) indicatesMethodOrField(;) reportRecoverableErrorWithToken(late, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[UnexpectedModifierInNonNnbd, The modifier 'late' is only available in null safe libraries., null, {lexeme: late}], late, late) @@ -278,7 +278,7 @@ parseUnit(int) notEofOrValue(}, late) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y5) listener: beginMetadataStar(late) listener: endMetadataStar(0) @@ -304,7 +304,7 @@ parseUnit(int) notEofOrValue(}, late) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(late) parseExpressionStatement(;) parseExpression(;) 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 9297c2930776..4b95f3f5ae72 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 @@ -46,7 +46,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -127,7 +127,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -210,7 +210,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -320,7 +320,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.intertwined.expect index ed0dab5cf51b..fc08ae69f3fc 100644 --- a/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(test) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_builtin.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_builtin.dart.intertwined.expect index 3f2b288cad93..97aba29572fb 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_builtin.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_builtin.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(void) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_pseudoKeyword.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_pseudoKeyword.dart.intertwined.expect index 7b51b42f8330..112a32d47f55 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_pseudoKeyword.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_pseudoKeyword.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(void) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.intertwined.expect index f58d3da901b3..77d1048f2c80 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(test) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.intertwined.expect index bdfc7118c3c8..bfdbe23a7bc6 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(test) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_if_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_if_case.dart.intertwined.expect index 4d6743fee388..5fbdaf07c3e6 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_if_case.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_if_case.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(test) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.intertwined.expect index 6a2bf44f2e81..8eb976cc0057 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(test) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.intertwined.expect index bb7db49bd531..e6eb3942ed0e 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(test) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_builtin.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_builtin.dart.intertwined.expect index 87372c8d78d9..b54e7fb09174 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_builtin.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_builtin.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(void) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_pseudoKeyword.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_pseudoKeyword.dart.intertwined.expect index e967f3c1e717..d657127f9642 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_pseudoKeyword.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_pseudoKeyword.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(void) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_beforeWhen.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_beforeWhen.dart.intertwined.expect index 50b72ef132fb..09b8c7cb119b 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_beforeWhen.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_beforeWhen.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(void) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_builtin.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_builtin.dart.intertwined.expect index 817df2d902fa..74822cc7f305 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_builtin.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_builtin.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(void) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_pseudoKeyword.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_pseudoKeyword.dart.intertwined.expect index 4e4434e2ec38..f93c4b0ab72c 100644 --- a/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_pseudoKeyword.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_unprefixed_pseudoKeyword.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(void) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/error_recovery_after_question_suffix_in_expression.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/error_recovery_after_question_suffix_in_expression.dart.intertwined.expect index ba51a07b58e4..808665b54e0c 100644 --- a/pkg/front_end/parser_testcases/patterns/error_recovery_after_question_suffix_in_expression.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/error_recovery_after_question_suffix_in_expression.dart.intertwined.expect @@ -37,8 +37,8 @@ parseUnit(f) notEofOrValue(}, true) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(true) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/list_insideAssignment_typed_nonEmpty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_insideAssignment_typed_nonEmpty.dart.intertwined.expect index a7c0701264f8..370c1c3fd4c6 100644 --- a/pkg/front_end/parser_testcases/patterns/list_insideAssignment_typed_nonEmpty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/list_insideAssignment_typed_nonEmpty.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, <) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(<) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_empty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_empty.dart.intertwined.expect index d0da162f5ee0..765865e1705c 100644 --- a/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_empty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_empty.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, []) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction([]) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_emptyWithWhitespace.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_emptyWithWhitespace.dart.intertwined.expect index 7dc6d84f32e3..7f9f6070fedf 100644 --- a/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_emptyWithWhitespace.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_emptyWithWhitespace.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, [) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction([) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_nonEmpty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_nonEmpty.dart.intertwined.expect index d953f0e4c9eb..a32fef890809 100644 --- a/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_nonEmpty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/list_insideAssignment_untyped_nonEmpty.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, [) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction([) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_typed_nonEmpty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_typed_nonEmpty.dart.intertwined.expect index 24c386edc519..76818ea03769 100644 --- a/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_typed_nonEmpty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_typed_nonEmpty.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_empty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_empty.dart.intertwined.expect index 026364c46758..07198eccf0fe 100644 --- a/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_empty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_empty.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_emptyWithWhitespace.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_emptyWithWhitespace.dart.intertwined.expect index e071e62526ef..a6cd298bbf55 100644 --- a/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_emptyWithWhitespace.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_emptyWithWhitespace.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_nonEmpty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_nonEmpty.dart.intertwined.expect index c3124cec164e..4c1cf48dbf1f 100644 --- a/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_nonEmpty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/list_insideDeclaration_untyped_nonEmpty.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/map_insideAssignment_typed_nonEmpty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_insideAssignment_typed_nonEmpty.dart.intertwined.expect index d90ee47bf26a..0cc0b7ba41a4 100644 --- a/pkg/front_end/parser_testcases/patterns/map_insideAssignment_typed_nonEmpty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/map_insideAssignment_typed_nonEmpty.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, <) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(<) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/map_insideAssignment_untyped_empty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_insideAssignment_untyped_empty.dart.intertwined.expect index 06d1df830573..aa5a74b1707a 100644 --- a/pkg/front_end/parser_testcases/patterns/map_insideAssignment_untyped_empty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/map_insideAssignment_untyped_empty.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/map_insideAssignment_untyped_nonEmpty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_insideAssignment_untyped_nonEmpty.dart.intertwined.expect index e9da67bc33c5..85484c9b6c34 100644 --- a/pkg/front_end/parser_testcases/patterns/map_insideAssignment_untyped_nonEmpty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/map_insideAssignment_untyped_nonEmpty.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_typed_nonEmpty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_typed_nonEmpty.dart.intertwined.expect index dd32cadab109..5af7557787b9 100644 --- a/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_typed_nonEmpty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_typed_nonEmpty.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_untyped_empty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_untyped_empty.dart.intertwined.expect index 842b516357a4..f2de8dc3762a 100644 --- a/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_untyped_empty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_untyped_empty.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_untyped_nonEmpty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_untyped_nonEmpty.dart.intertwined.expect index 12c10fcab140..ab1b617df54e 100644 --- a/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_untyped_nonEmpty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/map_insideDeclaration_untyped_nonEmpty.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.intertwined.expect index 6a2bf44f2e81..8eb976cc0057 100644 --- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(test) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.intertwined.expect index bb7db49bd531..e6eb3942ed0e 100644 --- a/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.intertwined.expect @@ -42,7 +42,7 @@ parseUnit(test) parseStatement({) parseStatementX({) parseExpressionStatementOrConstDeclaration({) - parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', false) + parseExpressionStatementOrDeclarationAfterModifiers(const, {, null, const, Instance of 'NoType', null) looksLikeLocalFunction(y) listener: beginMetadataStar(const) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/patterns/object_prefixedNamedUnderscore_withoutTypeArgs_insideDeclaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/object_prefixedNamedUnderscore_withoutTypeArgs_insideDeclaration.dart.intertwined.expect index ea4219a93607..74a400b2b85f 100644 --- a/pkg/front_end/parser_testcases/patterns/object_prefixedNamedUnderscore_withoutTypeArgs_insideDeclaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/object_prefixedNamedUnderscore_withoutTypeArgs_insideDeclaration.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) skipObjectPatternRest(Future) diff --git a/pkg/front_end/parser_testcases/patterns/object_prefixed_withTypeArgs_insideAssignment.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/object_prefixed_withTypeArgs_insideAssignment.dart.intertwined.expect index 1c01bf77f51c..8171b605e141 100644 --- a/pkg/front_end/parser_testcases/patterns/object_prefixed_withTypeArgs_insideAssignment.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/object_prefixed_withTypeArgs_insideAssignment.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, async) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(async) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/object_prefixed_withTypeArgs_insideDeclaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/object_prefixed_withTypeArgs_insideDeclaration.dart.intertwined.expect index b662059b9903..3e90426de28a 100644 --- a/pkg/front_end/parser_testcases/patterns/object_prefixed_withTypeArgs_insideDeclaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/object_prefixed_withTypeArgs_insideDeclaration.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) skipObjectPatternRest(Future) diff --git a/pkg/front_end/parser_testcases/patterns/object_unprefixedNamedUnderscore_withTypeArgs_insideDeclaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/object_unprefixedNamedUnderscore_withTypeArgs_insideDeclaration.dart.intertwined.expect index c414157f83ce..391bd6f6fbe0 100644 --- a/pkg/front_end/parser_testcases/patterns/object_unprefixedNamedUnderscore_withTypeArgs_insideDeclaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/object_unprefixedNamedUnderscore_withTypeArgs_insideDeclaration.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) skipObjectPatternRest(_) diff --git a/pkg/front_end/parser_testcases/patterns/object_unprefixedNamedUnderscore_withoutTypeArgs_insideDeclaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/object_unprefixedNamedUnderscore_withoutTypeArgs_insideDeclaration.dart.intertwined.expect index c38de41135ab..ba53c5502efc 100644 --- a/pkg/front_end/parser_testcases/patterns/object_unprefixedNamedUnderscore_withoutTypeArgs_insideDeclaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/object_unprefixedNamedUnderscore_withoutTypeArgs_insideDeclaration.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) skipObjectPatternRest(_) 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 ef93ce9f924b..d0b0421ee76e 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 @@ -73,7 +73,7 @@ parseUnit(class) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) skipObjectPatternRest(C) diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_insideAssignment.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_insideAssignment.dart.intertwined.expect index 048456081a7d..ab37f5d68d0a 100644 --- a/pkg/front_end/parser_testcases/patterns/parenthesized_insideAssignment.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/parenthesized_insideAssignment.dart.intertwined.expect @@ -39,8 +39,8 @@ parseUnit(f) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_insideDeclaration.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_insideDeclaration.dart.intertwined.expect index d6e4b19ceadc..62973549fff1 100644 --- a/pkg/front_end/parser_testcases/patterns/parenthesized_insideDeclaration.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/parenthesized_insideDeclaration.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_disallowsLate.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_disallowsLate.dart.intertwined.expect index 5a35424c5add..7e71b93ec7a0 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_disallowsLate.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_disallowsLate.dart.intertwined.expect @@ -39,8 +39,8 @@ parseUnit(f) notEofOrValue(}, late) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, late, var, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, late, var, null, null) looksLikeLocalFunction(() listener: beginMetadataStar(late) listener: endMetadataStar(0) @@ -65,7 +65,7 @@ parseUnit(f) notEofOrValue(}, _) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(_) parseExpressionStatement(;) parseExpression(;) @@ -92,8 +92,8 @@ parseUnit(f) notEofOrValue(}, )) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction()) parseExpressionStatement(;) parseExpression(;) @@ -123,8 +123,8 @@ parseUnit(f) notEofOrValue(}, =) parseStatement()) parseStatementX()) - parseExpressionStatementOrDeclaration(), false) - parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, false) + parseExpressionStatementOrDeclaration(), null) + parseExpressionStatementOrDeclarationAfterModifiers(), ), null, null, null, null) looksLikeLocalFunction(=) parseExpressionStatement()) parseExpression()) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_final_extractor.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_final_extractor.dart.intertwined.expect index 1114784f570f..9ba2aff62c67 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_final_extractor.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_final_extractor.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, final) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, null) looksLikeOuterPatternEquals(final) skipOuterPattern(final) skipObjectPatternRest(C) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_extractor.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_extractor.dart.intertwined.expect index 0124f8f0295d..13600dc9abb1 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_extractor.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_extractor.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) skipObjectPatternRest(C) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_list.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_list.dart.intertwined.expect index 9fcbdd88a4c7..1a980c392999 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_list.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_list.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_map.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_map.dart.intertwined.expect index bb7c0cef2c4c..1147d586c20e 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_map.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_map.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_parenthesized.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_parenthesized.dart.intertwined.expect index d6e4b19ceadc..62973549fff1 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_parenthesized.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_parenthesized.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_record.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_record.dart.intertwined.expect index 18e2a5ee4948..60d376ede3d0 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_record.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_noMetadata_var_record.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_extractor.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_extractor.dart.intertwined.expect index 1eeedbe385c8..017e4e08e8e0 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_extractor.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_extractor.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(final) listener: endMetadata(@, null, final) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, null) looksLikeOuterPatternEquals(final) skipOuterPattern(final) skipObjectPatternRest(C) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_list.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_list.dart.intertwined.expect index fc1f9dd62238..69a9d074977d 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_list.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_list.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(final) listener: endMetadata(@, null, final) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, null) looksLikeOuterPatternEquals(final) skipOuterPattern(final) parsePatternVariableDeclarationStatement(final, {, final) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_map.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_map.dart.intertwined.expect index b45e165081d7..a405dd93144d 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_map.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_map.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(final) listener: endMetadata(@, null, final) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, null) looksLikeOuterPatternEquals(final) skipOuterPattern(final) parsePatternVariableDeclarationStatement(final, {, final) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_parenthesized.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_parenthesized.dart.intertwined.expect index e1fe02a43132..849f39744d06 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_parenthesized.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_parenthesized.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(final) listener: endMetadata(@, null, final) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, null) looksLikeOuterPatternEquals(final) skipOuterPattern(final) parsePatternVariableDeclarationStatement(final, {, final) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_record.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_record.dart.intertwined.expect index 7e6c38e7d45f..2cfa3303161b 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_record.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_final_record.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(final) listener: endMetadata(@, null, final) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, null) looksLikeOuterPatternEquals(final) skipOuterPattern(final) parsePatternVariableDeclarationStatement(final, {, final) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_extractor.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_extractor.dart.intertwined.expect index 01094bbeabb9..d4db7ddf72c3 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_extractor.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_extractor.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(var) listener: endMetadata(@, null, var) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) skipObjectPatternRest(C) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_list.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_list.dart.intertwined.expect index 3027a26ba0de..628f413f33c0 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_list.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_list.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(var) listener: endMetadata(@, null, var) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) parsePatternVariableDeclarationStatement(var, {, var) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_map.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_map.dart.intertwined.expect index 754077f75853..119e476ae1bd 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_map.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_map.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(var) listener: endMetadata(@, null, var) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) parsePatternVariableDeclarationStatement(var, {, var) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_parenthesized.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_parenthesized.dart.intertwined.expect index f18331daea52..703726724339 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_parenthesized.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_parenthesized.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(var) listener: endMetadata(@, null, var) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) parsePatternVariableDeclarationStatement(var, {, var) diff --git a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_record.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_record.dart.intertwined.expect index 905fe3576668..9698f8d85bef 100644 --- a/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_record.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/patternVariableDeclarationStatement_withMetadata_var_record.dart.intertwined.expect @@ -39,7 +39,7 @@ parseUnit(f) notEofOrValue(}, @) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) + parseExpressionStatementOrDeclaration({, null) parseMetadataStar({) listener: beginMetadataStar(@) parseMetadata({) @@ -52,7 +52,7 @@ parseUnit(f) listener: handleNoArguments(var) listener: endMetadata(@, null, var) listener: endMetadataStar(1) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) parsePatternVariableDeclarationStatement(var, {, var) diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart new file mode 100644 index 000000000000..e999ea488584 --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart @@ -0,0 +1 @@ +void f(x) => [for (var (a, b) = x; ;) 0]; diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.expect b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.expect new file mode 100644 index 000000000000..0617d4ad9ba4 --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.expect @@ -0,0 +1,43 @@ +beginCompilationUnit(void) + beginMetadataStar(void) + endMetadataStar(0) + beginTopLevelMember(void) + beginTopLevelMethod(, null, null) + handleVoidKeyword(void) + handleIdentifier(f, topLevelFunctionDeclaration) + handleNoTypeVariables(() + beginFormalParameters((, MemberKind.TopLevelMethod) + beginMetadataStar(x) + endMetadataStar(0) + beginFormalParameter(x, MemberKind.TopLevelMethod, null, null, null) + handleNoType(() + handleIdentifier(x, formalParameterDeclaration) + handleFormalParameterWithoutValue()) + endFormalParameter(null, null, null, x, null, null, FormalParameterKind.requiredPositional, MemberKind.TopLevelMethod) + endFormalParameters(1, (, ), MemberKind.TopLevelMethod) + handleAsyncModifier(null, null) + handleNoTypeArguments([) + beginForControlFlow(null, for) + beginMetadataStar(var) + endMetadataStar(0) + handleNoType(() + handleVariablePattern(null, a) + handlePatternField(null) + handleNoType(,) + handleVariablePattern(null, b) + handlePatternField(null) + handleRecordPattern((, 2) + handleIdentifier(x, expression) + handleNoTypeArguments(;) + handleNoArguments(;) + handleSend(x, ;) + handleForInitializerPatternVariableAssignment(var, =) + handleEmptyStatement(;) + handleForLoopParts(for, (, ;, 0) + handleLiteralInt(0) + endForControlFlow(0) + handleLiteralList(1, [, null, ]) + handleExpressionFunctionBody(=>, ;) + endTopLevelMethod(void, null, ;) + endTopLevelDeclaration() +endCompilationUnit(1, ) diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.intertwined.expect new file mode 100644 index 000000000000..6d32b7f83885 --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.intertwined.expect @@ -0,0 +1,109 @@ +parseUnit(void) + skipErrorTokens(void) + listener: beginCompilationUnit(void) + syntheticPreviousToken(void) + parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext') + parseMetadataStar() + listener: beginMetadataStar(void) + listener: endMetadataStar(0) + parseTopLevelMemberImpl() + listener: beginTopLevelMember(void) + parseTopLevelMethod(, null, null, , Instance of 'VoidType', null, f, false) + listener: beginTopLevelMethod(, null, null) + listener: handleVoidKeyword(void) + ensureIdentifierPotentiallyRecovered(void, topLevelFunctionDeclaration, false) + listener: handleIdentifier(f, topLevelFunctionDeclaration) + parseMethodTypeVar(f) + listener: handleNoTypeVariables(() + parseGetterOrFormalParameters(f, f, false, MemberKind.TopLevelMethod) + parseFormalParameters(f, MemberKind.TopLevelMethod) + parseFormalParametersRest((, MemberKind.TopLevelMethod) + listener: beginFormalParameters((, MemberKind.TopLevelMethod) + parseFormalParameter((, FormalParameterKind.requiredPositional, MemberKind.TopLevelMethod) + parseMetadataStar(() + listener: beginMetadataStar(x) + listener: endMetadataStar(0) + listener: beginFormalParameter(x, MemberKind.TopLevelMethod, null, null, null) + listener: handleNoType(() + ensureIdentifier((, formalParameterDeclaration) + listener: handleIdentifier(x, formalParameterDeclaration) + listener: handleFormalParameterWithoutValue()) + listener: endFormalParameter(null, null, null, x, null, null, FormalParameterKind.requiredPositional, MemberKind.TopLevelMethod) + listener: endFormalParameters(1, (, ), MemberKind.TopLevelMethod) + parseAsyncModifierOpt()) + listener: handleAsyncModifier(null, null) + inPlainSync() + parseFunctionBody(), false, false) + parseExpressionFunctionBody(=>, false) + parseExpression(=>) + looksLikeOuterPatternEquals(=>) + skipOuterPattern(=>) + parsePrecedenceExpression(=>, 1, true) + parseUnaryExpression(=>, true) + parsePrimary(=>, expression) + listener: handleNoTypeArguments([) + parseLiteralListSuffix(=>, null) + listener: beginForControlFlow(null, for) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers(var, (, null, var, null, ForPartsContext(null)) + looksLikeOuterPatternEquals(var) + skipOuterPattern(var) + listener: beginMetadataStar(var) + listener: endMetadataStar(0) + parsePattern(var, precedence: 1, isRefutableContext: false) + parsePrimaryPattern(var, isRefutableContext: false) + parseParenthesizedPatternOrRecordPattern(var, isRefutableContext: false) + parsePattern((, precedence: 1, isRefutableContext: false) + parsePrimaryPattern((, isRefutableContext: false) + parseVariablePattern((, typeInfo: Instance of 'NoType') + listener: handleNoType(() + listener: handleVariablePattern(null, a) + listener: handlePatternField(null) + parsePattern(,, precedence: 1, isRefutableContext: false) + parsePrimaryPattern(,, isRefutableContext: false) + parseVariablePattern(,, typeInfo: Instance of 'NoType') + listener: handleNoType(,) + listener: handleVariablePattern(null, b) + listener: handlePatternField(null) + ensureCloseParen(b, () + listener: handleRecordPattern((, 2) + parseExpression(=) + looksLikeOuterPatternEquals(=) + skipOuterPattern(=) + skipObjectPatternRest(x) + parsePrecedenceExpression(=, 1, true) + parseUnaryExpression(=, true) + parsePrimary(=, expression) + parseSendOrFunctionLiteral(=, expression) + parseSend(=, expression) + isNextIdentifier(=) + ensureIdentifier(=, expression) + listener: handleIdentifier(x, expression) + listener: handleNoTypeArguments(;) + parseArgumentsOpt(x) + listener: handleNoArguments(;) + listener: handleSend(x, ;) + listener: handleForInitializerPatternVariableAssignment(var, =) + parseForLoopPartsRest(x, for, null) + ensureSemicolon(x) + parseEmptyStatement(;) + listener: handleEmptyStatement(;) + listener: handleForLoopParts(for, (, ;, 0) + parseExpression()) + looksLikeOuterPatternEquals()) + skipOuterPattern()) + parsePrecedenceExpression(), 1, true) + parseUnaryExpression(), true) + parsePrimary(), expression) + parseLiteralInt()) + listener: handleLiteralInt(0) + listener: endForControlFlow(0) + listener: handleLiteralList(1, [, null, ]) + ensureSemicolon(]) + listener: handleExpressionFunctionBody(=>, ;) + inGenerator() + listener: endTopLevelMethod(void, null, ;) + listener: endTopLevelDeclaration() + reportAllErrorTokens(void) + listener: endCompilationUnit(1, ) diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.parser.expect b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.parser.expect new file mode 100644 index 000000000000..eebc9f27f88b --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.parser.expect @@ -0,0 +1,5 @@ +void f(x) => [for (var (a, b) = x; ;) 0]; + + +void[KeywordToken] f[StringToken]([BeginToken]x[StringToken])[SimpleToken] =>[SimpleToken] [[BeginToken]for[KeywordToken] ([BeginToken]var[KeywordToken] ([BeginToken]a[StringToken],[SimpleToken] b[StringToken])[SimpleToken] =[SimpleToken] x[StringToken];[SimpleToken] ;[SimpleToken])[SimpleToken] 0[StringToken]][SimpleToken];[SimpleToken] +[SimpleToken] diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.scanner.expect b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.scanner.expect new file mode 100644 index 000000000000..eebc9f27f88b --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_element.dart.scanner.expect @@ -0,0 +1,5 @@ +void f(x) => [for (var (a, b) = x; ;) 0]; + + +void[KeywordToken] f[StringToken]([BeginToken]x[StringToken])[SimpleToken] =>[SimpleToken] [[BeginToken]for[KeywordToken] ([BeginToken]var[KeywordToken] ([BeginToken]a[StringToken],[SimpleToken] b[StringToken])[SimpleToken] =[SimpleToken] x[StringToken];[SimpleToken] ;[SimpleToken])[SimpleToken] 0[StringToken]][SimpleToken];[SimpleToken] +[SimpleToken] diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart new file mode 100644 index 000000000000..a15431891dad --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart @@ -0,0 +1,3 @@ +void f(x) { + for (var (a, b) = x; ;) {} +} diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.expect b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.expect new file mode 100644 index 000000000000..1ec7d1d35473 --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.expect @@ -0,0 +1,45 @@ +beginCompilationUnit(void) + beginMetadataStar(void) + endMetadataStar(0) + beginTopLevelMember(void) + beginTopLevelMethod(, null, null) + handleVoidKeyword(void) + handleIdentifier(f, topLevelFunctionDeclaration) + handleNoTypeVariables(() + beginFormalParameters((, MemberKind.TopLevelMethod) + beginMetadataStar(x) + endMetadataStar(0) + beginFormalParameter(x, MemberKind.TopLevelMethod, null, null, null) + handleNoType(() + handleIdentifier(x, formalParameterDeclaration) + handleFormalParameterWithoutValue()) + endFormalParameter(null, null, null, x, null, null, FormalParameterKind.requiredPositional, MemberKind.TopLevelMethod) + endFormalParameters(1, (, ), MemberKind.TopLevelMethod) + handleAsyncModifier(null, null) + beginBlockFunctionBody({) + beginForStatement(for) + beginMetadataStar(var) + endMetadataStar(0) + handleNoType(() + handleVariablePattern(null, a) + handlePatternField(null) + handleNoType(,) + handleVariablePattern(null, b) + handlePatternField(null) + handleRecordPattern((, 2) + handleIdentifier(x, expression) + handleNoTypeArguments(;) + handleNoArguments(;) + handleSend(x, ;) + handleForInitializerPatternVariableAssignment(var, =) + handleEmptyStatement(;) + handleForLoopParts(for, (, ;, 0) + beginForStatementBody({) + beginBlock({, BlockKind(statement)) + endBlock(0, {, }, BlockKind(statement)) + endForStatementBody(}) + endForStatement(}) + endBlockFunctionBody(1, {, }) + endTopLevelMethod(void, null, }) + endTopLevelDeclaration() +endCompilationUnit(1, ) diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.intertwined.expect new file mode 100644 index 000000000000..daa202d547b3 --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.intertwined.expect @@ -0,0 +1,105 @@ +parseUnit(void) + skipErrorTokens(void) + listener: beginCompilationUnit(void) + syntheticPreviousToken(void) + parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext') + parseMetadataStar() + listener: beginMetadataStar(void) + listener: endMetadataStar(0) + parseTopLevelMemberImpl() + listener: beginTopLevelMember(void) + parseTopLevelMethod(, null, null, , Instance of 'VoidType', null, f, false) + listener: beginTopLevelMethod(, null, null) + listener: handleVoidKeyword(void) + ensureIdentifierPotentiallyRecovered(void, topLevelFunctionDeclaration, false) + listener: handleIdentifier(f, topLevelFunctionDeclaration) + parseMethodTypeVar(f) + listener: handleNoTypeVariables(() + parseGetterOrFormalParameters(f, f, false, MemberKind.TopLevelMethod) + parseFormalParameters(f, MemberKind.TopLevelMethod) + parseFormalParametersRest((, MemberKind.TopLevelMethod) + listener: beginFormalParameters((, MemberKind.TopLevelMethod) + parseFormalParameter((, FormalParameterKind.requiredPositional, MemberKind.TopLevelMethod) + parseMetadataStar(() + listener: beginMetadataStar(x) + listener: endMetadataStar(0) + listener: beginFormalParameter(x, MemberKind.TopLevelMethod, null, null, null) + listener: handleNoType(() + ensureIdentifier((, formalParameterDeclaration) + listener: handleIdentifier(x, formalParameterDeclaration) + listener: handleFormalParameterWithoutValue()) + listener: endFormalParameter(null, null, null, x, null, null, FormalParameterKind.requiredPositional, MemberKind.TopLevelMethod) + listener: endFormalParameters(1, (, ), MemberKind.TopLevelMethod) + parseAsyncModifierOpt()) + listener: handleAsyncModifier(null, null) + inPlainSync() + parseFunctionBody(), false, false) + listener: beginBlockFunctionBody({) + notEofOrValue(}, for) + parseStatement({) + parseStatementX({) + parseForStatement({, null) + listener: beginForStatement(for) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers(var, (, null, var, null, ForPartsContext(null)) + looksLikeOuterPatternEquals(var) + skipOuterPattern(var) + listener: beginMetadataStar(var) + listener: endMetadataStar(0) + parsePattern(var, precedence: 1, isRefutableContext: false) + parsePrimaryPattern(var, isRefutableContext: false) + parseParenthesizedPatternOrRecordPattern(var, isRefutableContext: false) + parsePattern((, precedence: 1, isRefutableContext: false) + parsePrimaryPattern((, isRefutableContext: false) + parseVariablePattern((, typeInfo: Instance of 'NoType') + listener: handleNoType(() + listener: handleVariablePattern(null, a) + listener: handlePatternField(null) + parsePattern(,, precedence: 1, isRefutableContext: false) + parsePrimaryPattern(,, isRefutableContext: false) + parseVariablePattern(,, typeInfo: Instance of 'NoType') + listener: handleNoType(,) + listener: handleVariablePattern(null, b) + listener: handlePatternField(null) + ensureCloseParen(b, () + listener: handleRecordPattern((, 2) + parseExpression(=) + looksLikeOuterPatternEquals(=) + skipOuterPattern(=) + skipObjectPatternRest(x) + parsePrecedenceExpression(=, 1, true) + parseUnaryExpression(=, true) + parsePrimary(=, expression) + parseSendOrFunctionLiteral(=, expression) + parseSend(=, expression) + isNextIdentifier(=) + ensureIdentifier(=, expression) + listener: handleIdentifier(x, expression) + listener: handleNoTypeArguments(;) + parseArgumentsOpt(x) + listener: handleNoArguments(;) + listener: handleSend(x, ;) + listener: handleForInitializerPatternVariableAssignment(var, =) + parseForRest(null, x, for) + parseForLoopPartsRest(x, for, null) + ensureSemicolon(x) + parseEmptyStatement(;) + listener: handleEmptyStatement(;) + listener: handleForLoopParts(for, (, ;, 0) + listener: beginForStatementBody({) + parseStatement()) + parseStatementX()) + parseBlock(), BlockKind(statement)) + ensureBlock(), null, null) + listener: beginBlock({, BlockKind(statement)) + notEofOrValue(}, }) + listener: endBlock(0, {, }, BlockKind(statement)) + listener: endForStatementBody(}) + listener: endForStatement(}) + notEofOrValue(}, }) + listener: endBlockFunctionBody(1, {, }) + listener: endTopLevelMethod(void, null, }) + listener: endTopLevelDeclaration() + reportAllErrorTokens(void) + listener: endCompilationUnit(1, ) diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.parser.expect b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.parser.expect new file mode 100644 index 000000000000..f750f40deec1 --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.parser.expect @@ -0,0 +1,9 @@ +void f(x) { +for (var (a, b) = x; ;) {} +} + + +void[KeywordToken] f[StringToken]([BeginToken]x[StringToken])[SimpleToken] {[BeginToken] +for[KeywordToken] ([BeginToken]var[KeywordToken] ([BeginToken]a[StringToken],[SimpleToken] b[StringToken])[SimpleToken] =[SimpleToken] x[StringToken];[SimpleToken] ;[SimpleToken])[SimpleToken] {[BeginToken]}[SimpleToken] +}[SimpleToken] +[SimpleToken] diff --git a/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.scanner.expect b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.scanner.expect new file mode 100644 index 000000000000..f750f40deec1 --- /dev/null +++ b/pkg/front_end/parser_testcases/patterns/pattern_inForInitializer_statement.dart.scanner.expect @@ -0,0 +1,9 @@ +void f(x) { +for (var (a, b) = x; ;) {} +} + + +void[KeywordToken] f[StringToken]([BeginToken]x[StringToken])[SimpleToken] {[BeginToken] +for[KeywordToken] ([BeginToken]var[KeywordToken] ([BeginToken]a[StringToken],[SimpleToken] b[StringToken])[SimpleToken] =[SimpleToken] x[StringToken];[SimpleToken] ;[SimpleToken])[SimpleToken] {[BeginToken]}[SimpleToken] +}[SimpleToken] +[SimpleToken] diff --git a/pkg/front_end/parser_testcases/patterns/record_insideAssignment_empty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_insideAssignment_empty.dart.intertwined.expect index c0535969ea64..48b00102d2ce 100644 --- a/pkg/front_end/parser_testcases/patterns/record_insideAssignment_empty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/record_insideAssignment_empty.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/record_insideAssignment_oneField.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_insideAssignment_oneField.dart.intertwined.expect index 0b841e023852..e81e57a1740c 100644 --- a/pkg/front_end/parser_testcases/patterns/record_insideAssignment_oneField.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/record_insideAssignment_oneField.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/record_insideAssignment_twoFields.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_insideAssignment_twoFields.dart.intertwined.expect index 4db9e50c1e65..f47a51b6ce05 100644 --- a/pkg/front_end/parser_testcases/patterns/record_insideAssignment_twoFields.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/record_insideAssignment_twoFields.dart.intertwined.expect @@ -38,8 +38,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_empty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_empty.dart.intertwined.expect index dadaa8f64baf..891371d6a6ec 100644 --- a/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_empty.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_empty.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_oneField.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_oneField.dart.intertwined.expect index e719577ac7a0..372542d3b59e 100644 --- a/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_oneField.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_oneField.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_twoFields.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_twoFields.dart.intertwined.expect index 5a402768f1b6..70f6bf38c486 100644 --- a/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_twoFields.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/record_insideDeclaration_twoFields.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/skipOuterPattern_eof.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/skipOuterPattern_eof.dart.intertwined.expect index b497769a12b5..40dffedc41e3 100644 --- a/pkg/front_end/parser_testcases/patterns/skipOuterPattern_eof.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/skipOuterPattern_eof.dart.intertwined.expect @@ -29,7 +29,7 @@ parseUnit(UnmatchedToken({)) notEofOrValue(}, int) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(int) parseExpressionStatement({) parseExpression({) @@ -56,7 +56,7 @@ parseUnit(UnmatchedToken({)) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) looksLikeLocalFunction(=) diff --git a/pkg/front_end/parser_testcases/patterns/variable_bare_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/variable_bare_insideCast.dart.intertwined.expect index bb8670018a29..e21e6f39019a 100644 --- a/pkg/front_end/parser_testcases/patterns/variable_bare_insideCast.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/variable_bare_insideCast.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/patterns/variable_bare_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/variable_bare_insideNullAssert.dart.intertwined.expect index 35c868e508f1..c341855a445b 100644 --- a/pkg/front_end/parser_testcases/patterns/variable_bare_insideNullAssert.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/variable_bare_insideNullAssert.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeOuterPatternEquals(var) skipOuterPattern(var) listener: beginMetadataStar(var) diff --git a/pkg/front_end/parser_testcases/record/is_and_as.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/is_and_as.dart.intertwined.expect index 7f34a965204d..67eece23c82b 100644 --- a/pkg/front_end/parser_testcases/record/is_and_as.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/is_and_as.dart.intertwined.expect @@ -41,7 +41,7 @@ parseUnit(foo) notEofOrValue(}, final) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, null) looksLikeLocalFunction(b) listener: beginMetadataStar(final) listener: endMetadataStar(0) @@ -131,7 +131,7 @@ parseUnit(foo) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -168,7 +168,7 @@ parseUnit(foo) notEofOrValue(}, final) parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclarationAfterModifiers(final, }, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, }, null, final, null, null) looksLikeLocalFunction(c) listener: beginMetadataStar(final) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/record/is_record_conditional_expression.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/is_record_conditional_expression.dart.intertwined.expect index bf5043eb879b..e07685601131 100644 --- a/pkg/front_end/parser_testcases/record/is_record_conditional_expression.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/is_record_conditional_expression.dart.intertwined.expect @@ -41,7 +41,7 @@ parseUnit(foo) notEofOrValue(}, final) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, null) looksLikeLocalFunction(b) listener: beginMetadataStar(final) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/record/record_and_commas.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_and_commas.dart.intertwined.expect index db5b28533145..1fcd398b3fa2 100644 --- a/pkg/front_end/parser_testcases/record/record_and_commas.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_and_commas.dart.intertwined.expect @@ -29,8 +29,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(emptyRecord1) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -61,8 +61,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(emptyRecord2) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -95,8 +95,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(emptyRecord3) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -129,8 +129,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(emptyRecord4) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -165,8 +165,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(emptyRecord5) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -247,8 +247,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(emptyRecord6) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -339,8 +339,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(emptyRecord7) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -449,8 +449,8 @@ parseUnit(main) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(emptyRecord8) listener: beginMetadataStar(() listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/record/record_literal_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_literal_01.dart.intertwined.expect index 4cd648f5976a..f726ab7768c7 100644 --- a/pkg/front_end/parser_testcases/record/record_literal_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_literal_01.dart.intertwined.expect @@ -28,7 +28,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(record1) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -87,7 +87,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(record2) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -146,7 +146,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -195,7 +195,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -244,7 +244,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) @@ -293,7 +293,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/record/record_literal_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_literal_02.dart.intertwined.expect index 59d7a9f34fd9..18c1f8a800a1 100644 --- a/pkg/front_end/parser_testcases/record/record_literal_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_literal_02.dart.intertwined.expect @@ -28,8 +28,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement({) parseExpression({) @@ -64,8 +64,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -115,8 +115,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -160,8 +160,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/record/record_literal_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_literal_03.dart.intertwined.expect index 31accb93c754..2d0fb44c5114 100644 --- a/pkg/front_end/parser_testcases/record/record_literal_03.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_literal_03.dart.intertwined.expect @@ -28,7 +28,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(r1) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -63,7 +63,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(r2) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -101,7 +101,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(r3) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -139,7 +139,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(r4) listener: beginMetadataStar(var) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/record/record_literal_04.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_literal_04.dart.intertwined.expect index 049c77b7851b..576112b96483 100644 --- a/pkg/front_end/parser_testcases/record/record_literal_04.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_literal_04.dart.intertwined.expect @@ -28,7 +28,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, null) looksLikeLocalFunction(r1) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -65,7 +65,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(r2) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -126,7 +126,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(r3) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -187,7 +187,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(r4) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -227,7 +227,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(r5) listener: beginMetadataStar(var) listener: endMetadataStar(0) @@ -266,7 +266,7 @@ parseUnit(void) notEofOrValue(}, var) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(var, ;, null, var, null, null) looksLikeLocalFunction(r6) listener: beginMetadataStar(var) listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/record/record_type_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_01.dart.intertwined.expect index a787c7693a4d..9d8e02a4fb43 100644 --- a/pkg/front_end/parser_testcases/record/record_type_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_type_01.dart.intertwined.expect @@ -28,8 +28,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(record1) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -92,8 +92,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record1Named) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -158,8 +158,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record2) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -222,8 +222,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record2Named) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -288,8 +288,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record3) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -396,8 +396,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record3Named) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -506,8 +506,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record4) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -614,8 +614,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record4Named) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -724,8 +724,8 @@ parseUnit(void) notEofOrValue(}, void) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(foobar) listener: beginMetadataStar(void) listener: endMetadataStar(0) @@ -773,8 +773,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record5) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -872,7 +872,7 @@ parseUnit(void) notEofOrValue(}, int) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(async) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -926,7 +926,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -962,8 +962,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(async) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -1039,7 +1039,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -1075,8 +1075,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(}) parseStatementX(}) - parseExpressionStatementOrDeclaration(}, false) - parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, false) + parseExpressionStatementOrDeclaration(}, null) + parseExpressionStatementOrDeclarationAfterModifiers(}, }, null, null, null, null) looksLikeLocalFunction(async) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -1181,8 +1181,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -1230,7 +1230,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -1275,8 +1275,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -1354,8 +1354,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) @@ -1403,7 +1403,7 @@ parseUnit(void) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) @@ -1448,8 +1448,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(() parseExpressionStatement(;) parseExpression(;) diff --git a/pkg/front_end/parser_testcases/record/record_type_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_02.dart.intertwined.expect index 765d01dc3247..9c5fa9526d78 100644 --- a/pkg/front_end/parser_testcases/record/record_type_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_type_02.dart.intertwined.expect @@ -28,8 +28,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(record1) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -98,8 +98,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record2) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -175,8 +175,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(record1) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -223,8 +223,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record2) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -279,8 +279,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(record3) listener: beginMetadataStar(() listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/record/record_type_04.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_04.dart.intertwined.expect index 4f83653122de..7633960b296f 100644 --- a/pkg/front_end/parser_testcases/record/record_type_04.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_type_04.dart.intertwined.expect @@ -28,8 +28,8 @@ parseUnit(void) notEofOrValue(}, Function) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(x) listener: beginMetadataStar(Function) listener: endMetadataStar(0) @@ -114,7 +114,7 @@ parseUnit(void) notEofOrValue(}, int) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y1) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -175,7 +175,7 @@ parseUnit(void) notEofOrValue(}, int) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y2) listener: beginMetadataStar(int) listener: endMetadataStar(0) @@ -236,8 +236,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(z1) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -317,8 +317,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(z2) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -398,8 +398,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(z3) listener: beginMetadataStar(() listener: endMetadataStar(0) @@ -497,8 +497,8 @@ parseUnit(void) notEofOrValue(}, () parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclaration(;, false) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclaration(;, null) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(z4) listener: beginMetadataStar(() listener: endMetadataStar(0) diff --git a/pkg/front_end/parser_testcases/record/record_type_as_type_arguments.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_as_type_arguments.dart.intertwined.expect index 1cffcd6d54ce..49f23e7fd3e7 100644 --- a/pkg/front_end/parser_testcases/record/record_type_as_type_arguments.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_type_as_type_arguments.dart.intertwined.expect @@ -28,7 +28,7 @@ parseUnit(void) notEofOrValue(}, final) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(final, {, null, final, null, null) looksLikeLocalFunction(x) listener: beginMetadataStar(final) listener: endMetadataStar(0) @@ -83,7 +83,7 @@ parseUnit(void) notEofOrValue(}, List) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y) listener: beginMetadataStar(List) listener: endMetadataStar(0) @@ -140,7 +140,7 @@ parseUnit(void) notEofOrValue(}, Map) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(z) listener: beginMetadataStar(Map) listener: endMetadataStar(0) @@ -217,7 +217,7 @@ parseUnit(void) notEofOrValue(}, List) parseStatement(;) parseStatementX(;) - parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, null) looksLikeLocalFunction(y2) listener: beginMetadataStar(List) listener: endMetadataStar(0) 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 070b633324b1..3e5cec4b475c 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 @@ -320,8 +320,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -479,8 +479,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -638,8 +638,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -917,8 +917,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -1046,8 +1046,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -1175,8 +1175,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -1454,8 +1454,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -1583,8 +1583,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -1712,8 +1712,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -2094,8 +2094,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -2263,8 +2263,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -2432,8 +2432,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -2727,8 +2727,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -2864,8 +2864,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -3001,8 +3001,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -3951,8 +3951,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -4118,8 +4118,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -4285,8 +4285,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -4576,8 +4576,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -4711,8 +4711,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -4846,8 +4846,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -5137,8 +5137,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -5272,8 +5272,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) @@ -5407,8 +5407,8 @@ parseUnit(() notEofOrValue(}, throw) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclaration({, false) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclaration({, null) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(throw) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/parser_testcases/record/record_type_in_for_loop.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_in_for_loop.dart.intertwined.expect index 3bb36af010bd..2b0f652894bf 100644 --- a/pkg/front_end/parser_testcases/record/record_type_in_for_loop.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_type_in_for_loop.dart.intertwined.expect @@ -31,9 +31,9 @@ parseUnit(main) parseStatementX({) parseForStatement({, null) listener: beginForStatement(for) - parseForLoopPartsStart(null, for) - parseExpressionStatementOrDeclaration((, true) - parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, true) + parseForLoopPartsStart(null, for, ForPartsContext(null)) + parseExpressionStatementOrDeclaration((, ForPartsContext(null)) + parseExpressionStatementOrDeclarationAfterModifiers((, (, null, null, null, ForPartsContext(null)) listener: beginMetadataStar(() listener: endMetadataStar(0) parseRecordType((, (, false) @@ -135,7 +135,7 @@ parseUnit(main) notEofOrValue(}, print) parseStatement({) parseStatementX({) - parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, false) + parseExpressionStatementOrDeclarationAfterModifiers({, {, null, null, null, null) looksLikeLocalFunction(print) parseExpressionStatement({) parseExpression({) diff --git a/pkg/front_end/test/parser_test_listener.dart b/pkg/front_end/test/parser_test_listener.dart index dd34ac1807ad..970a64682c93 100644 --- a/pkg/front_end/test/parser_test_listener.dart +++ b/pkg/front_end/test/parser_test_listener.dart @@ -865,6 +865,16 @@ class ParserTestListener implements Listener { 'handleForInitializerLocalVariableDeclaration(' '$token, ' '$forIn)'); } + @override + void handleForInitializerPatternVariableAssignment( + Token keyword, Token equals) { + seen(keyword); + seen(equals); + doPrint('handleForInitializerPatternVariableAssignment(' + '$keyword, ' + '$equals)'); + } + @override void beginForStatement(Token token) { seen(token); diff --git a/pkg/front_end/test/parser_test_parser.dart b/pkg/front_end/test/parser_test_parser.dart index 36039d278bcc..a00ff90e226a 100644 --- a/pkg/front_end/test/parser_test_parser.dart +++ b/pkg/front_end/test/parser_test_parser.dart @@ -14,7 +14,7 @@ import 'package:_fe_analyzer_shared/src/parser/listener.dart' show Listener; import 'package:_fe_analyzer_shared/src/parser/member_kind.dart'; import 'package:_fe_analyzer_shared/src/parser/parser.dart' show Parser; import 'package:_fe_analyzer_shared/src/parser/parser_impl.dart' - show AwaitOrYieldContext; + show AwaitOrYieldContext, ForPartsContext; import 'package:_fe_analyzer_shared/src/parser/token_stream_rewriter.dart'; import 'package:_fe_analyzer_shared/src/parser/type_info.dart'; import 'package:_fe_analyzer_shared/src/scanner/token.dart'; @@ -1992,32 +1992,28 @@ class TestParser extends Parser { @override Token parseExpressionStatementOrDeclaration(final Token start, - [bool onlyParseVariableDeclarationStart = false]) { + [ForPartsContext? forPartsContext]) { doPrint('parseExpressionStatementOrDeclaration(' '$start, ' - '$onlyParseVariableDeclarationStart)'); + '$forPartsContext)'); indent++; - var result = super.parseExpressionStatementOrDeclaration( - start, onlyParseVariableDeclarationStart); + var result = + super.parseExpressionStatementOrDeclaration(start, forPartsContext); indent--; return result; } @override - Token parseExpressionStatementOrDeclarationAfterModifiers( - Token beforeType, - Token start, - Token? lateToken, - Token? varFinalOrConst, - TypeInfo? typeInfo, - bool onlyParseVariableDeclarationStart) { + Token parseExpressionStatementOrDeclarationAfterModifiers(Token beforeType, + Token start, Token? lateToken, Token? varFinalOrConst, TypeInfo? typeInfo, + [ForPartsContext? forPartsContext]) { doPrint('parseExpressionStatementOrDeclarationAfterModifiers(' '$beforeType, ' '$start, ' '$lateToken, ' '$varFinalOrConst, ' '$typeInfo, ' - '$onlyParseVariableDeclarationStart)'); + '$forPartsContext)'); indent++; var result = super.parseExpressionStatementOrDeclarationAfterModifiers( beforeType, @@ -2025,7 +2021,7 @@ class TestParser extends Parser { lateToken, varFinalOrConst, typeInfo, - onlyParseVariableDeclarationStart); + forPartsContext); indent--; return result; } @@ -2067,10 +2063,15 @@ class TestParser extends Parser { } @override - Token parseForLoopPartsStart(Token? awaitToken, Token forToken) { - doPrint('parseForLoopPartsStart(' '$awaitToken, ' '$forToken)'); + Token parseForLoopPartsStart( + Token? awaitToken, Token forToken, ForPartsContext forPartsContext) { + doPrint('parseForLoopPartsStart(' + '$awaitToken, ' + '$forToken, ' + '$forPartsContext)'); indent++; - var result = super.parseForLoopPartsStart(awaitToken, forToken); + var result = + super.parseForLoopPartsStart(awaitToken, forToken, forPartsContext); 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 b39399afb543..5715d21c6ff2 100644 --- a/pkg/front_end/test/parser_test_parser_creator.dart +++ b/pkg/front_end/test/parser_test_parser_creator.dart @@ -51,7 +51,7 @@ import 'package:_fe_analyzer_shared/src/parser/identifier_context.dart'; import 'package:_fe_analyzer_shared/src/parser/listener.dart' show Listener; import 'package:_fe_analyzer_shared/src/parser/member_kind.dart'; import 'package:_fe_analyzer_shared/src/parser/parser.dart' show Parser; -import 'package:_fe_analyzer_shared/src/parser/parser_impl.dart' show AwaitOrYieldContext; +import 'package:_fe_analyzer_shared/src/parser/parser_impl.dart' show AwaitOrYieldContext, ForPartsContext; import 'package:_fe_analyzer_shared/src/parser/token_stream_rewriter.dart'; import 'package:_fe_analyzer_shared/src/parser/type_info.dart'; import 'package:_fe_analyzer_shared/src/scanner/token.dart';