[parser] Add more tokens

Add
 * endToken to endBinaryExpression
 * endToken to handleEndingBinaryExpression
 * endToken to endConditionalExpression
 * beginToken (and rename to endToken) on handleExpressionStatement
 * rightSeparator to handleForLoopParts

Change-Id: I55d5a0e6c795b82d8f3480365e4cc3fbb59c65b5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/372482
Commit-Queue: Jens Johansen <jensj@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

pkg/_fe_analyzer_shared/lib/src/macros/code_optimizer.dart

@@ -285,7 +285,7 @@ class _Listener extends Listener {
   }
 
   @override
-  void endBinaryExpression(Token token) {
+  void endBinaryExpression(Token token, Token endToken) {
     Token? prefixToken = token.previous;
     if (prefixToken == null || prefixToken.type != TokenType.IDENTIFIER) {
       return;

pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart

@@ -599,8 +599,8 @@ class ForwardingListener implements Listener {
   }
 
   @override
-  void endBinaryExpression(Token token) {
-    listener?.endBinaryExpression(token);
+  void endBinaryExpression(Token token, Token endToken) {
+    listener?.endBinaryExpression(token, endToken);
   }
 
   @override
@@ -609,8 +609,8 @@ class ForwardingListener implements Listener {
   }
 
   @override
-  void handleEndingBinaryExpression(Token token) {
-    listener?.handleEndingBinaryExpression(token);
+  void handleEndingBinaryExpression(Token token, Token endToken) {
+    listener?.handleEndingBinaryExpression(token, endToken);
   }
 
   @override
@@ -707,8 +707,8 @@ class ForwardingListener implements Listener {
   }
 
   @override
-  void endConditionalExpression(Token question, Token colon) {
-    listener?.endConditionalExpression(question, colon);
+  void endConditionalExpression(Token question, Token colon, Token endToken) {
+    listener?.endConditionalExpression(question, colon, endToken);
   }
 
   @override
@@ -1470,8 +1470,8 @@ class ForwardingListener implements Listener {
   }
 
   @override
-  void handleExpressionStatement(Token token) {
-    listener?.handleExpressionStatement(token);
+  void handleExpressionStatement(Token beginToken, Token endToken) {
+    listener?.handleExpressionStatement(beginToken, endToken);
   }
 
   @override
@@ -1514,9 +1514,9 @@ class ForwardingListener implements Listener {
 
   @override
   void handleForLoopParts(Token forKeyword, Token leftParen,
-      Token leftSeparator, int updateExpressionCount) {
-    listener?.handleForLoopParts(
-        forKeyword, leftParen, leftSeparator, updateExpressionCount);
+      Token leftSeparator, Token rightSeparator, int updateExpressionCount) {
+    listener?.handleForLoopParts(forKeyword, leftParen, leftSeparator,
+        rightSeparator, updateExpressionCount);
   }
 
   @override

pkg/_fe_analyzer_shared/lib/src/parser/listener.dart

@@ -434,7 +434,7 @@ class Listener implements UnescapeErrorListener {
     logEvent("ExtraneousExpression");
   }
 
-  void handleExpressionStatement(Token token) {
+  void handleExpressionStatement(Token beginToken, Token endToken) {
     logEvent("ExpressionStatement");
   }
 
@@ -690,7 +690,7 @@ class Listener implements UnescapeErrorListener {
   /// or for control flow entry up to and including the closing parenthesis.
   /// `for` `(` initialization `;` condition `;` updaters `)`
   void handleForLoopParts(Token forKeyword, Token leftParen,
-      Token leftSeparator, int updateExpressionCount) {}
+      Token leftSeparator, Token rightSeparator, int updateExpressionCount) {}
 
   // TODO(jensj): Should this have a `beginToken`?
   void endForStatement(Token endToken) {
@@ -1780,7 +1780,7 @@ class Listener implements UnescapeErrorListener {
   /// Not called when the binary operator is `.`, `?.`, or `..`.
   void beginBinaryExpression(Token token) {}
 
-  void endBinaryExpression(Token token) {
+  void endBinaryExpression(Token token, Token endToken) {
     logEvent("BinaryExpression");
   }
 
@@ -1794,9 +1794,9 @@ class Listener implements UnescapeErrorListener {
   }
 
   /// Called for `.`, `?.` and `..`.
-  void handleEndingBinaryExpression(Token token) {
+  void handleEndingBinaryExpression(Token token, Token endToken) {
     // TODO(jensj): push implementation into subclasses
-    endBinaryExpression(token);
+    endBinaryExpression(token, endToken);
   }
 
   /// Called when the parser encounters a `?` operator and begins parsing a
@@ -1808,7 +1808,7 @@ class Listener implements UnescapeErrorListener {
   void handleConditionalExpressionColon() {}
 
   /// Called when the parser finishes processing a conditional expression.
-  void endConditionalExpression(Token question, Token colon) {
+  void endConditionalExpression(Token question, Token colon, Token endToken) {
     logEvent("ConditionalExpression");
   }
 

pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart

@@ -5772,9 +5772,10 @@ class Parser {
     // TODO(brianwilkerson): If the next token is not the start of a valid
     // expression, then this method shouldn't report that we have an expression
     // statement.
+    Token beginToken = token.next!;
     token = parseExpression(token);
     token = ensureSemicolon(token);
-    listener.handleExpressionStatement(token);
+    listener.handleExpressionStatement(beginToken, token);
     return token;
   }
 
@@ -5863,7 +5864,7 @@ class Parser {
     Token colon = ensureColon(token);
     listener.handleConditionalExpressionColon();
     token = parseExpressionWithoutCascade(colon);
-    listener.endConditionalExpression(question, colon);
+    listener.endConditionalExpression(question, colon, token);
     return token;
   }
 
@@ -6006,7 +6007,7 @@ class Parser {
                 token.next!,
                 IdentifierContext.expressionContinuation,
                 constantPatternContext);
-            listener.handleEndingBinaryExpression(operator);
+            listener.handleEndingBinaryExpression(operator, token);
 
             Token bangToken = token;
             if (optional('!', token.next!)) {
@@ -6085,7 +6086,7 @@ class Parser {
           // precedence level.
           token = parsePrecedenceExpression(token.next!, level + 1,
               allowCascades, ConstantPatternContext.none);
-          listener.endBinaryExpression(operator);
+          listener.endBinaryExpression(operator, token);
         }
         next = token.next!;
         type = next.type;
@@ -6290,7 +6291,7 @@ class Parser {
     } else {
       token = parseSend(token, IdentifierContext.expressionContinuation,
           ConstantPatternContext.none);
-      listener.handleEndingBinaryExpression(cascadeOperator);
+      listener.handleEndingBinaryExpression(cascadeOperator, token);
     }
     Token next = token.next!;
     Token mark;
@@ -6301,7 +6302,7 @@ class Parser {
         token = parseSend(next, IdentifierContext.expressionContinuation,
             ConstantPatternContext.none);
         next = token.next!;
-        listener.handleEndingBinaryExpression(period);
+        listener.handleEndingBinaryExpression(period, token);
       } else if (optional('!', next)) {
         listener.handleNonNullAssertExpression(next);
         token = next;
@@ -8419,6 +8420,7 @@ class Parser {
     } else {
       token = parseExpressionStatement(leftSeparator);
     }
+    Token rightSeparator = token;
     int expressionCount = 0;
     while (true) {
       Token next = token.next!;
@@ -8436,8 +8438,8 @@ class Parser {
       reportRecoverableErrorWithToken(token, codes.templateUnexpectedToken);
       token = leftParenthesis.endGroup!;
     }
-    listener.handleForLoopParts(
-        forToken, leftParenthesis, leftSeparator, expressionCount);
+    listener.handleForLoopParts(forToken, leftParenthesis, leftSeparator,
+        rightSeparator, expressionCount);
     return token;
   }
 

pkg/analyzer/lib/src/fasta/ast_builder.dart

@@ -996,7 +996,7 @@ class AstBuilder extends StackListener {
   }
 
   @override
-  void endBinaryExpression(Token operatorToken) {
+  void endBinaryExpression(Token operatorToken, Token endToken) {
     assert(operatorToken.isOperator ||
         optional('.', operatorToken) ||
         optional('?.', operatorToken) ||
@@ -1396,7 +1396,7 @@ class AstBuilder extends StackListener {
   }
 
   @override
-  void endConditionalExpression(Token question, Token colon) {
+  void endConditionalExpression(Token question, Token colon, Token endToken) {
     assert(optional('?', question));
     assert(optional(':', colon));
     debugEvent("ConditionalExpression");
@@ -4218,7 +4218,7 @@ class AstBuilder extends StackListener {
   }
 
   @override
-  void handleExpressionStatement(Token semicolon) {
+  void handleExpressionStatement(Token beginToken, Token semicolon) {
     assert(optional(';', semicolon));
     debugEvent("ExpressionStatement");
     var expression = pop() as ExpressionImpl;
@@ -4340,7 +4340,7 @@ class AstBuilder extends StackListener {
 
   @override
   void handleForLoopParts(Token forKeyword, Token leftParen,
-      Token leftSeparator, int updateExpressionCount) {
+      Token leftSeparator, Token rightSeparator, int updateExpressionCount) {
     assert(optional('for', forKeyword));
     assert(optional('(', leftParen));
     assert(optional(';', leftSeparator));

pkg/analyzer/tool/summary/mini_ast.dart

@@ -194,7 +194,7 @@ class MiniAstBuilder extends StackListener {
   }
 
   @override
-  void endBinaryExpression(Token token) {
+  void endBinaryExpression(Token token, Token endToken) {
     debugEvent("BinaryExpression");
 
     if (identical('.', token.stringValue)) {

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

@@ -2285,8 +2285,8 @@ class BodyBuilder extends StackListenerImpl
   }
 
   @override
-  void handleExpressionStatement(Token token) {
-    assert(checkState(token, [
+  void handleExpressionStatement(Token beginToken, Token endToken) {
+    assert(checkState(endToken, [
       unionOfKinds([
         ValueKinds.Expression,
         ValueKinds.Generator,
@@ -2295,7 +2295,7 @@ class BodyBuilder extends StackListenerImpl
     ]));
     debugEvent("ExpressionStatement");
     push(forest.createExpressionStatement(
-        offsetForToken(token), popForEffect()));
+        offsetForToken(endToken), popForEffect()));
   }
 
   @override
@@ -2746,7 +2746,7 @@ class BodyBuilder extends StackListenerImpl
   }
 
   @override
-  void endBinaryExpression(Token token) {
+  void endBinaryExpression(Token token, Token endToken) {
     assert(checkState(token, [
       unionOfKinds([
         ValueKinds.Expression,
@@ -4276,8 +4276,10 @@ class BodyBuilder extends StackListenerImpl
 
   @override
   void handleForLoopParts(Token forKeyword, Token leftParen,
-      Token leftSeparator, int updateExpressionCount) {
+      Token leftSeparator, Token rightSeparator, int updateExpressionCount) {
     push(forKeyword);
+    // TODO(jensj): Seems like leftParen and leftSeparator are just popped and
+    // thrown away. If that's the case there's no reason to push them.
     push(leftParen);
     push(leftSeparator);
     push(updateExpressionCount);
@@ -5392,7 +5394,7 @@ class BodyBuilder extends StackListenerImpl
   }
 
   @override
-  void endConditionalExpression(Token question, Token colon) {
+  void endConditionalExpression(Token question, Token colon, Token endToken) {
     debugEvent("ConditionalExpression");
     Expression elseExpression = popForValue();
     Expression thenExpression = pop() as Expression;

pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart

@@ -1044,7 +1044,7 @@ class _MacroListener implements Listener {
   }
 
   @override
-  void endBinaryExpression(Token token) {
+  void endBinaryExpression(Token token, Token endToken) {
     _unknown();
   }
 
@@ -1134,7 +1134,7 @@ class _MacroListener implements Listener {
   }
 
   @override
-  void endConditionalExpression(Token question, Token colon) {
+  void endConditionalExpression(Token question, Token colon, Token endToken) {
     _unhandled('conditional expression');
   }
 
@@ -1754,7 +1754,7 @@ class _MacroListener implements Listener {
   }
 
   @override
-  void handleEndingBinaryExpression(Token token) {
+  void handleEndingBinaryExpression(Token token, Token endToken) {
     _unknown();
   }
 
@@ -1795,7 +1795,7 @@ class _MacroListener implements Listener {
   }
 
   @override
-  void handleExpressionStatement(Token token) {
+  void handleExpressionStatement(Token beginToken, Token endToken) {
     _unsupported();
   }
 
@@ -1838,7 +1838,7 @@ class _MacroListener implements Listener {
 
   @override
   void handleForLoopParts(Token forKeyword, Token leftParen,
-      Token leftSeparator, int updateExpressionCount) {
+      Token leftSeparator, Token rightSeparator, int updateExpressionCount) {
     _unsupported();
   }
 

pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart

@@ -578,9 +578,11 @@ abstract class AbstractParserAstListener implements Listener {
   }
 
   @override
-  void handleExpressionStatement(Token token) {
-    ExpressionStatementHandle data =
-        new ExpressionStatementHandle(ParserAstType.HANDLE, token: token);
+  void handleExpressionStatement(Token beginToken, Token endToken) {
+    ExpressionStatementHandle data = new ExpressionStatementHandle(
+        ParserAstType.HANDLE,
+        beginToken: beginToken,
+        endToken: endToken);
     seen(data);
   }
 
@@ -879,11 +881,12 @@ abstract class AbstractParserAstListener implements Listener {
 
   @override
   void handleForLoopParts(Token forKeyword, Token leftParen,
-      Token leftSeparator, int updateExpressionCount) {
+      Token leftSeparator, Token rightSeparator, int updateExpressionCount) {
     ForLoopPartsHandle data = new ForLoopPartsHandle(ParserAstType.HANDLE,
         forKeyword: forKeyword,
         leftParen: leftParen,
         leftSeparator: leftSeparator,
+        rightSeparator: rightSeparator,
         updateExpressionCount: updateExpressionCount);
     seen(data);
   }
@@ -2309,9 +2312,9 @@ abstract class AbstractParserAstListener implements Listener {
   }
 
   @override
-  void endBinaryExpression(Token token) {
-    BinaryExpressionEnd data =
-        new BinaryExpressionEnd(ParserAstType.END, token: token);
+  void endBinaryExpression(Token token, Token endToken) {
+    BinaryExpressionEnd data = new BinaryExpressionEnd(ParserAstType.END,
+        token: token, endToken: endToken);
     seen(data);
   }
 
@@ -2330,9 +2333,11 @@ abstract class AbstractParserAstListener implements Listener {
   }
 
   @override
-  void handleEndingBinaryExpression(Token token) {
-    EndingBinaryExpressionHandle data =
-        new EndingBinaryExpressionHandle(ParserAstType.HANDLE, token: token);
+  void handleEndingBinaryExpression(Token token, Token endToken) {
+    EndingBinaryExpressionHandle data = new EndingBinaryExpressionHandle(
+        ParserAstType.HANDLE,
+        token: token,
+        endToken: endToken);
     seen(data);
   }
 
@@ -2351,11 +2356,12 @@ abstract class AbstractParserAstListener implements Listener {
   }
 
   @override
-  void endConditionalExpression(Token question, Token colon) {
+  void endConditionalExpression(Token question, Token colon, Token endToken) {
     ConditionalExpressionEnd data = new ConditionalExpressionEnd(
         ParserAstType.END,
         question: question,
-        colon: colon);
+        colon: colon,
+        endToken: endToken);
     seen(data);
   }
 
@@ -4321,15 +4327,21 @@ class ExtraneousExpressionHandle extends ParserAstNode {
   R accept<R>(ParserAstVisitor<R> v) => v.visitExtraneousExpressionHandle(this);
 }
 
-class ExpressionStatementHandle extends ParserAstNode {
-  final Token token;
+class ExpressionStatementHandle extends ParserAstNode
+    implements BeginAndEndTokenParserAstNode {
+  @override
+  final Token beginToken;
+  @override
+  final Token endToken;
 
-  ExpressionStatementHandle(ParserAstType type, {required this.token})
+  ExpressionStatementHandle(ParserAstType type,
+      {required this.beginToken, required this.endToken})
       : super("ExpressionStatement", type);
 
   @override
   Map<String, Object?> get deprecatedArguments => {
-        "token": token,
+        "beginToken": beginToken,
+        "endToken": endToken,
       };
 
   @override
@@ -4944,12 +4956,14 @@ class ForLoopPartsHandle extends ParserAstNode {
   final Token forKeyword;
   final Token leftParen;
   final Token leftSeparator;
+  final Token rightSeparator;
   final int updateExpressionCount;
 
   ForLoopPartsHandle(ParserAstType type,
       {required this.forKeyword,
       required this.leftParen,
       required this.leftSeparator,
+      required this.rightSeparator,
       required this.updateExpressionCount})
       : super("ForLoopParts", type);
 
@@ -4958,6 +4972,7 @@ class ForLoopPartsHandle extends ParserAstNode {
         "forKeyword": forKeyword,
         "leftParen": leftParen,
         "leftSeparator": leftSeparator,
+        "rightSeparator": rightSeparator,
         "updateExpressionCount": updateExpressionCount,
       };
 
@@ -8163,13 +8178,16 @@ class BinaryExpressionBegin extends ParserAstNode {
 
 class BinaryExpressionEnd extends ParserAstNode {
   final Token token;
+  final Token endToken;
 
-  BinaryExpressionEnd(ParserAstType type, {required this.token})
+  BinaryExpressionEnd(ParserAstType type,
+      {required this.token, required this.endToken})
       : super("BinaryExpression", type);
 
   @override
   Map<String, Object?> get deprecatedArguments => {
         "token": token,
+        "endToken": endToken,
       };
 
   @override
@@ -8208,13 +8226,16 @@ class BinaryPatternEnd extends ParserAstNode {
 
 class EndingBinaryExpressionHandle extends ParserAstNode {
   final Token token;
+  final Token endToken;
 
-  EndingBinaryExpressionHandle(ParserAstType type, {required this.token})
+  EndingBinaryExpressionHandle(ParserAstType type,
+      {required this.token, required this.endToken})
       : super("EndingBinaryExpression", type);
 
   @override
   Map<String, Object?> get deprecatedArguments => {
         "token": token,
+        "endToken": endToken,
       };
 
   @override
@@ -8252,15 +8273,17 @@ class ConditionalExpressionColonHandle extends ParserAstNode {
 class ConditionalExpressionEnd extends ParserAstNode {
   final Token question;
   final Token colon;
+  final Token endToken;
 
   ConditionalExpressionEnd(ParserAstType type,
-      {required this.question, required this.colon})
+      {required this.question, required this.colon, required this.endToken})
       : super("ConditionalExpression", type);
 
   @override
   Map<String, Object?> get deprecatedArguments => {
         "question": question,
         "colon": colon,
+        "endToken": endToken,
       };
 
   @override

pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect

@@ -33,7 +33,7 @@ beginCompilationUnit(augment)
         beginArguments(()
         endArguments(0, (, ))
         handleSend(augment, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(augment, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(augment, null, })
   endTopLevelDeclaration(})
@@ -64,7 +64,7 @@ beginCompilationUnit(augment)
         handleNoTypeArguments(;)
         handleNoArguments(;)
         handleSend(augment, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(augment, ;)
       endBlockFunctionBody(2, {, })
     endTopLevelMethod(augment, null, })
   endTopLevelDeclaration(})
@@ -130,14 +130,14 @@ beginCompilationUnit(augment)
         handleLiteralInt(1)
         handleIndexedExpression(null, [, ])
         handleAssignmentExpression(=)
-        handleExpressionStatement(;)
+        handleExpressionStatement(augment, ;)
         handleAugmentSuperExpression(augment, super, expression)
         handleIdentifier(value, expression)
         handleNoTypeArguments(;)
         handleNoArguments(;)
         handleSend(value, ;)
         handleAssignmentExpression(=)
-        handleExpressionStatement(;)
+        handleExpressionStatement(augment, ;)
       endBlockFunctionBody(2, {, })
     endTopLevelMethod(augment, set, })
   endTopLevelDeclaration(})
@@ -157,9 +157,9 @@ beginCompilationUnit(augment)
         beginArguments(()
         endArguments(0, (, ))
         handleSend(augment, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(augment, ;)
         handleAugmentSuperExpression(augment, super, expression)
-        handleExpressionStatement(;)
+        handleExpressionStatement(augment, ;)
         handleRecoverableError(Message[ExtraneousModifier, Can't have modifier 'augment' here., Try removing 'augment'., {lexeme: augment}], augment, augment)
         beginMetadataStar(augment)
         endMetadataStar(0)
@@ -176,7 +176,7 @@ beginCompilationUnit(augment)
         handleNoTypeArguments(;)
         handleNoArguments(;)
         handleSend(augment, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(augment, ;)
       endBlockFunctionBody(4, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})
@@ -209,7 +209,7 @@ beginCompilationUnit(augment)
               beginArguments(()
               endArguments(0, (, ))
               handleSend(augment, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(augment, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, augment, (, null, })
         endMember()
@@ -241,7 +241,7 @@ beginCompilationUnit(augment)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(augment, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(augment, ;)
             endBlockFunctionBody(2, {, })
           endClassMethod(null, augment, (, null, })
         endMember()
@@ -260,10 +260,10 @@ beginCompilationUnit(augment)
             beginBlockFunctionBody({)
               handleAugmentSuperExpression(augment, super, expression)
               handleUnaryPostfixAssignmentExpression(++)
-              handleExpressionStatement(;)
+              handleExpressionStatement(augment, ;)
               handleAugmentSuperExpression(augment, super, expression)
               handleUnaryPrefixAssignmentExpression(--)
-              handleExpressionStatement(;)
+              handleExpressionStatement(--, ;)
               beginReturnStatement(return)
                 handleAugmentSuperExpression(augment, super, expression)
                 handleUnaryPrefixExpression(-)
@@ -298,7 +298,7 @@ beginCompilationUnit(augment)
               handleNoArguments(;)
               handleSend(value, ;)
               handleAssignmentExpression(=)
-              handleExpressionStatement(;)
+              handleExpressionStatement(augment, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(set, augment, (, null, })
         endMember()
@@ -319,9 +319,9 @@ beginCompilationUnit(augment)
               beginArguments(()
               endArguments(0, (, ))
               handleSend(augment, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(augment, ;)
               handleAugmentSuperExpression(augment, super, expression)
-              handleExpressionStatement(;)
+              handleExpressionStatement(augment, ;)
               handleRecoverableError(Message[ExtraneousModifier, Can't have modifier 'augment' here., Try removing 'augment'., {lexeme: augment}], augment, augment)
               beginMetadataStar(augment)
               endMetadataStar(0)
@@ -338,7 +338,7 @@ beginCompilationUnit(augment)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(augment, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(augment, ;)
             endBlockFunctionBody(4, {, })
           endClassMethod(null, void, (, null, })
         endMember()

pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect

@@ -43,7 +43,7 @@ parseUnit(augment)
                                 listener: endArguments(0, (, ))
                             listener: handleSend(augment, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(augment, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(augment, null, })
@@ -118,7 +118,7 @@ parseUnit(augment)
                                   listener: handleNoArguments(;)
                                 listener: handleSend(augment, ;)
                     ensureSemicolon(augment)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(augment, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(2, {, })
         listener: endTopLevelMethod(augment, null, })
@@ -269,7 +269,7 @@ parseUnit(augment)
                           listener: handleIndexedExpression(null, [, ])
                       listener: handleAssignmentExpression(=)
                   ensureSemicolon(])
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(augment, ;)
           notEofOrValue(}, augment)
           parseStatement(;)
             parseStatementX(;)
@@ -295,7 +295,7 @@ parseUnit(augment)
                                 listener: handleSend(value, ;)
                       listener: handleAssignmentExpression(=)
                   ensureSemicolon(value)
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(augment, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(2, {, })
         listener: endTopLevelMethod(augment, set, })
@@ -341,7 +341,7 @@ parseUnit(augment)
                                 listener: endArguments(0, (, ))
                             listener: handleSend(augment, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(augment, ;)
           notEofOrValue(}, augment)
           parseStatement(;)
             parseStatementX(;)
@@ -354,7 +354,7 @@ parseUnit(augment)
                           parseAugmentSuperExpression(;, expression)
                             listener: handleAugmentSuperExpression(augment, super, expression)
                   ensureSemicolon(super)
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(augment, ;)
           notEofOrValue(}, augment)
           parseStatement(;)
             parseStatementX(;)
@@ -402,7 +402,7 @@ parseUnit(augment)
                                   listener: handleNoArguments(;)
                                 listener: handleSend(augment, ;)
                     ensureSemicolon(augment)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(augment, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(4, {, })
         listener: endTopLevelMethod(void, null, })
@@ -475,7 +475,7 @@ parseUnit(augment)
                                         listener: endArguments(0, (, ))
                                     listener: handleSend(augment, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(augment, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(1, {, })
                 listener: endClassMethod(null, augment, (, null, })
@@ -554,7 +554,7 @@ parseUnit(augment)
                                           listener: handleNoArguments(;)
                                         listener: handleSend(augment, ;)
                             ensureSemicolon(augment)
-                            listener: handleExpressionStatement(;)
+                            listener: handleExpressionStatement(augment, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(2, {, })
                 listener: endClassMethod(null, augment, (, null, })
@@ -598,7 +598,7 @@ parseUnit(augment)
                                     listener: handleAugmentSuperExpression(augment, super, expression)
                               listener: handleUnaryPostfixAssignmentExpression(++)
                           ensureSemicolon(++)
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(augment, ;)
                   notEofOrValue(}, --)
                   parseStatement(;)
                     parseStatementX(;)
@@ -616,7 +616,7 @@ parseUnit(augment)
                                           listener: handleAugmentSuperExpression(augment, super, expression)
                                   listener: handleUnaryPrefixAssignmentExpression(--)
                             ensureSemicolon(super)
-                            listener: handleExpressionStatement(;)
+                            listener: handleExpressionStatement(--, ;)
                   notEofOrValue(}, return)
                   parseStatement(;)
                     parseStatementX(;)
@@ -702,7 +702,7 @@ parseUnit(augment)
                                         listener: handleSend(value, ;)
                               listener: handleAssignmentExpression(=)
                           ensureSemicolon(value)
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(augment, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(1, {, })
                 listener: endClassMethod(set, augment, (, null, })
@@ -752,7 +752,7 @@ parseUnit(augment)
                                         listener: endArguments(0, (, ))
                                     listener: handleSend(augment, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(augment, ;)
                   notEofOrValue(}, augment)
                   parseStatement(;)
                     parseStatementX(;)
@@ -765,7 +765,7 @@ parseUnit(augment)
                                   parseAugmentSuperExpression(;, expression)
                                     listener: handleAugmentSuperExpression(augment, super, expression)
                           ensureSemicolon(super)
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(augment, ;)
                   notEofOrValue(}, augment)
                   parseStatement(;)
                     parseStatementX(;)
@@ -813,7 +813,7 @@ parseUnit(augment)
                                           listener: handleNoArguments(;)
                                         listener: handleSend(augment, ;)
                             ensureSemicolon(augment)
-                            listener: handleExpressionStatement(;)
+                            listener: handleExpressionStatement(augment, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(4, {, })
                 listener: endClassMethod(null, void, (, null, })

pkg/front_end/parser_testcases/error_recovery/await_not_in_async.dart.expect

@@ -28,7 +28,7 @@ beginCompilationUnit(Future)
       beginArguments(()
       endArguments(0, (, ))
       handleSend(value, ;)
-      handleEndingBinaryExpression(.)
+      handleEndingBinaryExpression(., ))
       handleExpressionFunctionBody(=>, ;)
     endTopLevelMethod(Future, null, ;)
   endTopLevelDeclaration(;)
@@ -51,7 +51,7 @@ beginCompilationUnit(Future)
           handleSend(f, ;)
           handleRecoverableError(AwaitNotAsync, await, await)
         endInvalidAwaitExpression(await, ), AwaitNotAsync)
-        handleExpressionStatement(;)
+        handleExpressionStatement(await, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/await_not_in_async.dart.intertwined.expect

@@ -57,7 +57,7 @@ parseUnit(Future)
                             listener: beginArguments(()
                             listener: endArguments(0, (, ))
                       listener: handleSend(value, ;)
-                listener: handleEndingBinaryExpression(.)
+                listener: handleEndingBinaryExpression(., ))
             ensureSemicolon())
             listener: handleExpressionFunctionBody(=>, ;)
             inGenerator()
@@ -122,7 +122,7 @@ parseUnit(Future)
                           listener: handleRecoverableError(AwaitNotAsync, await, await)
                         listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
                 ensureSemicolon())
-                listener: handleExpressionStatement(;)
+                listener: handleExpressionStatement(await, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_00.dart.expect

@@ -26,7 +26,7 @@ beginCompilationUnit(void)
           handleLiteralList(0, [, null, ])
         endParenthesizedExpression(()
         handleLiteralList(1, [, null, ])
-        handleExpressionStatement(;)
+        handleExpressionStatement([, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})
@@ -51,7 +51,7 @@ beginCompilationUnit(void)
           handleRecoverableError(Message[ExpectedButGot, Expected ')' before this., null, {string: )}], ], ])
         endParenthesizedExpression(()
         handleLiteralList(1, [, null, ])
-        handleExpressionStatement(;)
+        handleExpressionStatement([, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_00.dart.intertwined.expect

@@ -56,7 +56,7 @@ parseUnit(void)
                                           listener: endParenthesizedExpression(()
                               listener: handleLiteralList(1, [, null, ])
                     ensureSemicolon(])
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement([, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(void, null, })
@@ -125,7 +125,7 @@ parseUnit(void)
                                           listener: endParenthesizedExpression(()
                               listener: handleLiteralList(1, [, null, ])
                     ensureSemicolon(])
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement([, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_02.dart.expect

@@ -24,7 +24,7 @@ beginCompilationUnit(void)
           handleNoTypeArguments([)
           handleLiteralList(0, [, null, ])
           handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], [, [)
-          handleExpressionStatement(;)
+          handleExpressionStatement([, ;)
         endBlock(1, {, }, BlockKind(statement))
         handleEmptyStatement(;)
       endBlockFunctionBody(2, {, })

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_02.dart.intertwined.expect

@@ -49,7 +49,7 @@ parseUnit(UnmatchedToken([))
                             reportRecoverableError([, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                               listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], [, [)
                             rewriter()
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement([, ;)
                 notEofOrValue(}, })
                 listener: endBlock(1, {, }, BlockKind(statement))
           notEofOrValue(}, ;)

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_03.dart.expect

@@ -35,14 +35,14 @@ beginCompilationUnit(void)
           endArguments(0, (, ))
           handleSend(foo, ))
           handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ), ))
-          handleExpressionStatement(;)
+          handleExpressionStatement(foo, ;)
           handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got ')'., Try inserting an identifier before ')'., {lexeme: )}], ), ))
           handleIdentifier(, expression)
           handleNoTypeArguments())
           handleNoArguments())
           handleSend(, ))
           handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ), ))
-          handleExpressionStatement(;)
+          handleExpressionStatement(), ;)
           handleRecoverableError(Message[UnexpectedToken, Unexpected token ')'., null, {lexeme: )}], ), ))
           handleEmptyStatement(;)
         endBlock(3, {, }, BlockKind(statement))

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_03.dart.intertwined.expect

@@ -58,7 +58,7 @@ parseUnit(void)
                           reportRecoverableError(), Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                             listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ), ))
                           rewriter()
-                        listener: handleExpressionStatement(;)
+                        listener: handleExpressionStatement(foo, ;)
                 notEofOrValue(}, ))
                 parseStatement(;)
                   parseStatementX(;)
@@ -85,7 +85,7 @@ parseUnit(void)
                             reportRecoverableError(), Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                               listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ), ))
                             rewriter()
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(), ;)
                 reportRecoverableError(), Message[UnexpectedToken, Unexpected token ')'., null, {lexeme: )}])
                   listener: handleRecoverableError(Message[UnexpectedToken, Unexpected token ')'., null, {lexeme: )}], ), ))
                 notEofOrValue(}, ;)

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_04.dart.expect

@@ -43,21 +43,21 @@ beginCompilationUnit(void)
               endArguments(0, (, ))
               handleSend(bar, ))
               handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ), ))
-              handleExpressionStatement(;)
+              handleExpressionStatement(bar, ;)
               handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got ')'., Try inserting an identifier before ')'., {lexeme: )}], ), ))
               handleIdentifier(, expression)
               handleNoTypeArguments())
               handleNoArguments())
               handleSend(, ))
               handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ), ))
-              handleExpressionStatement(;)
+              handleExpressionStatement(), ;)
               handleRecoverableError(Message[UnexpectedToken, Unexpected token ';'., null, {lexeme: ;}], ), ))
               handleEmptyStatement(;)
             endBlockFunctionBody(3, {, })
           endFunctionExpression((, })
         endArguments(1, (, ))
         handleSend(foo, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(foo, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_04.dart.intertwined.expect

@@ -91,7 +91,7 @@ parseUnit(void)
                                                               reportRecoverableError(), Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                                                                 listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ), ))
                                                               rewriter()
-                                                            listener: handleExpressionStatement(;)
+                                                            listener: handleExpressionStatement(bar, ;)
                                                     notEofOrValue(}, ))
                                                     parseStatement(;)
                                                       parseStatementX(;)
@@ -118,7 +118,7 @@ parseUnit(void)
                                                                 reportRecoverableError(), Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                                                                   listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ), ))
                                                                 rewriter()
-                                                              listener: handleExpressionStatement(;)
+                                                              listener: handleExpressionStatement(), ;)
                                                     reportRecoverableError(;, Message[UnexpectedToken, Unexpected token ';'., null, {lexeme: ;}])
                                                       listener: handleRecoverableError(Message[UnexpectedToken, Unexpected token ';'., null, {lexeme: ;}], ), ))
                                                     notEofOrValue(}, ;)
@@ -132,7 +132,7 @@ parseUnit(void)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(foo, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(foo, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_05.dart.expect

@@ -25,7 +25,7 @@ beginCompilationUnit(void)
           handleLiteralInt(1)
           handleLiteralList(1, [, null, ])
           handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], 1, 1)
-          handleExpressionStatement(;)
+          handleExpressionStatement([, ;)
         endBlock(1, {, }, BlockKind(statement))
         handleEmptyStatement(;)
       endBlockFunctionBody(2, {, })

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_05.dart.intertwined.expect

@@ -55,7 +55,7 @@ parseUnit(UnmatchedToken([))
                             reportRecoverableError(1, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                               listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], 1, 1)
                             rewriter()
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement([, ;)
                 notEofOrValue(}, })
                 listener: endBlock(1, {, }, BlockKind(statement))
           notEofOrValue(}, ;)

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_06.dart.expect

@@ -34,7 +34,7 @@ beginCompilationUnit(main)
             handleSend(, ;)
           endArguments(1, (, ))
         endNewExpression(new)
-        handleExpressionStatement(;)
+        handleExpressionStatement(new, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(main, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_06.dart.intertwined.expect

@@ -71,7 +71,7 @@ parseUnit(UnmatchedToken(())
                                   listener: endArguments(1, (, ))
                               listener: endNewExpression(new)
                     ensureSemicolon())
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(new, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(main, null, })

pkg/front_end/parser_testcases/error_recovery/comment_on_non_ascii_identifier.dart.expect

@@ -76,7 +76,7 @@ beginCompilationUnit(main)
           handleSend(æFoo, ))
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -86,7 +86,7 @@ beginCompilationUnit(main)
           handleSend(fooÆ, ))
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -96,7 +96,7 @@ beginCompilationUnit(main)
           handleSend(foo, ))
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
       endBlockFunctionBody(6, {, })
     endTopLevelMethod(main, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/comment_on_non_ascii_identifier.dart.intertwined.expect

@@ -147,7 +147,7 @@ parseUnit(NonAsciiIdentifierToken(230))
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -185,7 +185,7 @@ parseUnit(NonAsciiIdentifierToken(230))
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -223,7 +223,7 @@ parseUnit(NonAsciiIdentifierToken(230))
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(6, {, })
         listener: endTopLevelMethod(main, null, })

pkg/front_end/parser_testcases/error_recovery/empty_for.dart.expect

@@ -42,8 +42,8 @@ beginCompilationUnit(main)
           handleNoArguments())
           handleSend(, ))
           handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], (, ()
-          handleExpressionStatement(;)
-          handleForLoopParts(for, (, ;, 0)
+          handleExpressionStatement(), ;)
+          handleForLoopParts(for, (, ;, ;, 0)
           beginForStatementBody({)
             beginBlock({, BlockKind(statement))
             endBlock(0, {, }, BlockKind(statement))

pkg/front_end/parser_testcases/error_recovery/empty_for.dart.intertwined.expect

@@ -77,8 +77,8 @@ parseUnit(main)
                         reportRecoverableError((, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                           listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], (, ()
                         rewriter()
-                      listener: handleExpressionStatement(;)
-                    listener: handleForLoopParts(for, (, ;, 0)
+                      listener: handleExpressionStatement(), ;)
+                    listener: handleForLoopParts(for, (, ;, ;, 0)
                   listener: beginForStatementBody({)
                   parseStatement())
                     parseStatementX())

pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.expect

@@ -142,9 +142,9 @@ beginCompilationUnit(extension)
         handleNoTypeArguments(})
         handleNoArguments(})
         handleSend(a, })
-        handleEndingBinaryExpression(.)
+        handleEndingBinaryExpression(., a)
         handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], a, a)
-        handleExpressionStatement(;)
+        handleExpressionStatement(l, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})
@@ -195,9 +195,9 @@ beginCompilationUnit(extension)
           handleNoTypeArguments())
           handleNoArguments())
           handleSend(b, ))
-          handleEndingBinaryExpression(.)
+          handleEndingBinaryExpression(., b)
         endParenthesizedExpression(()
-        handleExpressionStatement(;)
+        handleExpressionStatement((, ;)
       endBlockFunctionBody(2, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect

@@ -242,12 +242,12 @@ parseUnit(extension)
                             parseArgumentsOpt(a)
                               listener: handleNoArguments(})
                             listener: handleSend(a, })
-                      listener: handleEndingBinaryExpression(.)
+                      listener: handleEndingBinaryExpression(., a)
                   ensureSemicolon(a)
                     reportRecoverableError(a, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                       listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], a, a)
                     rewriter()
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(l, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(void, null, })
@@ -354,11 +354,11 @@ parseUnit(extension)
                                           parseArgumentsOpt(b)
                                             listener: handleNoArguments())
                                           listener: handleSend(b, ))
-                                    listener: handleEndingBinaryExpression(.)
+                                    listener: handleEndingBinaryExpression(., b)
                                 ensureCloseParen(b, ()
                                 listener: endParenthesizedExpression(()
                     ensureSemicolon())
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement((, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(2, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/for_in_with_colon.dart.expect

@@ -49,7 +49,7 @@ beginCompilationUnit(main)
                 handleSend(i, ))
               endArguments(1, (, ))
               handleSend(print, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(print, ;)
             endBlock(1, {, }, BlockKind(statement))
           endForInBody(})
         endForIn(})

pkg/front_end/parser_testcases/error_recovery/for_in_with_colon.dart.intertwined.expect

@@ -127,7 +127,7 @@ parseUnit(main)
                                                   listener: endArguments(1, (, ))
                                             listener: handleSend(print, ;)
                                 ensureSemicolon())
-                                listener: handleExpressionStatement(;)
+                                listener: handleExpressionStatement(print, ;)
                         notEofOrValue(}, })
                         listener: endBlock(1, {, }, BlockKind(statement))
                   listener: endForInBody(})

pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.expect

@@ -75,9 +75,9 @@ beginCompilationUnit(class)
           handleNoTypeArguments(})
           handleNoArguments(})
           handleSend(, })
-        endBinaryExpression(<)
+        endBinaryExpression(<, )
         handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], <, <)
-        handleExpressionStatement(;)
+        handleExpressionStatement(C, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(main, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.intertwined.expect

@@ -121,12 +121,12 @@ parseUnit(class)
                               parseArgumentsOpt()
                                 listener: handleNoArguments(})
                               listener: handleSend(, })
-                      listener: endBinaryExpression(<)
+                      listener: endBinaryExpression(<, )
                   ensureSemicolon()
                     reportRecoverableError(<, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                       listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], <, <)
                     rewriter()
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(C, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(main, null, })

pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect

@@ -93,7 +93,7 @@ beginCompilationUnit(abstract)
             handleNoTypeArguments(xor)
             handleNoArguments(xor)
             handleSend(hashCode, xor)
-            handleEndingBinaryExpression(.)
+            handleEndingBinaryExpression(., hashCode)
             handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'xor' is written as '^' instead of the written out word., Try replacing 'xor' with '^'., {string: xor, string2: ^}], xor, xor)
             beginBinaryExpression(^)
               handleLiteralNull(null)
@@ -101,8 +101,8 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(hashCode, ;)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(^)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(^, hashCode)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -126,15 +126,15 @@ beginCompilationUnit(abstract)
             handleNoTypeArguments(^)
             handleNoArguments(^)
             handleSend(hashCode, ^)
-            handleEndingBinaryExpression(.)
+            handleEndingBinaryExpression(., hashCode)
             beginBinaryExpression(^)
               handleLiteralNull(null)
               handleIdentifier(hashCode, expressionContinuation)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(hashCode, ;)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(^)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(^, hashCode)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -160,7 +160,7 @@ beginCompilationUnit(abstract)
                 handleNoTypeArguments(xor)
                 handleNoArguments(xor)
                 handleSend(hashCode, xor)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., hashCode)
                 handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'xor' is written as '^' instead of the written out word., Try replacing 'xor' with '^'., {string: xor, string2: ^}], xor, xor)
                 beginBinaryExpression(^)
                   handleLiteralNull(null)
@@ -168,8 +168,8 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(hashCode, ;)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(^)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(^, hashCode)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -196,15 +196,15 @@ beginCompilationUnit(abstract)
                 handleNoTypeArguments(^)
                 handleNoArguments(^)
                 handleSend(hashCode, ^)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., hashCode)
                 beginBinaryExpression(^)
                   handleLiteralNull(null)
                   handleIdentifier(hashCode, expressionContinuation)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(hashCode, ;)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(^)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(^, hashCode)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -231,8 +231,8 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(xor)
               handleNoArguments(xor)
               handleSend(hashCode, xor)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(+)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(+, hashCode)
             handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'xor' is written as '^' instead of the written out word., Try replacing 'xor' with '^'., {string: xor, string2: ^}], xor, xor)
             beginBinaryExpression(^)
               handleLiteralNull(null)
@@ -240,11 +240,11 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(+)
               handleNoArguments(+)
               handleSend(hashCode, +)
-              handleEndingBinaryExpression(.)
+              handleEndingBinaryExpression(., hashCode)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(^)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(^, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -270,19 +270,19 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(^)
               handleNoArguments(^)
               handleSend(hashCode, ^)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(+)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(+, hashCode)
             beginBinaryExpression(^)
               handleLiteralNull(null)
               handleIdentifier(hashCode, expressionContinuation)
               handleNoTypeArguments(+)
               handleNoArguments(+)
               handleSend(hashCode, +)
-              handleEndingBinaryExpression(.)
+              handleEndingBinaryExpression(., hashCode)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(^)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(^, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -310,8 +310,8 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(xor)
                   handleNoArguments(xor)
                   handleSend(hashCode, xor)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(+)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(+, hashCode)
                 handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'xor' is written as '^' instead of the written out word., Try replacing 'xor' with '^'., {string: xor, string2: ^}], xor, xor)
                 beginBinaryExpression(^)
                   handleLiteralNull(null)
@@ -319,11 +319,11 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(+)
                   handleNoArguments(+)
                   handleSend(hashCode, +)
-                  handleEndingBinaryExpression(.)
+                  handleEndingBinaryExpression(., hashCode)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(^)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(^, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -352,19 +352,19 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(^)
                   handleNoArguments(^)
                   handleSend(hashCode, ^)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(+)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(+, hashCode)
                 beginBinaryExpression(^)
                   handleLiteralNull(null)
                   handleIdentifier(hashCode, expressionContinuation)
                   handleNoTypeArguments(+)
                   handleNoArguments(+)
                   handleSend(hashCode, +)
-                  handleEndingBinaryExpression(.)
+                  handleEndingBinaryExpression(., hashCode)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(^)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(^, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -410,7 +410,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(y, ;)
-            endBinaryExpression(^)
+            endBinaryExpression(^, y)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -454,7 +454,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(y, ;)
-            endBinaryExpression(^)
+            endBinaryExpression(^, y)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -501,7 +501,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(y, ;)
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -548,7 +548,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(y, ;)
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -604,7 +604,7 @@ beginCompilationUnit(abstract)
                       handleNoTypeArguments(;)
                       handleNoArguments(;)
                       handleSend(y, ;)
-                    endBinaryExpression(^)
+                    endBinaryExpression(^, y)
                   endVariableInitializer(=)
                 endInitializedIdentifier(z)
               endVariablesDeclaration(1, ;)
@@ -667,7 +667,7 @@ beginCompilationUnit(abstract)
                       handleNoTypeArguments(;)
                       handleNoArguments(;)
                       handleSend(y, ;)
-                    endBinaryExpression(^)
+                    endBinaryExpression(^, y)
                   endVariableInitializer(=)
                 endInitializedIdentifier(z)
               endVariablesDeclaration(1, ;)
@@ -717,7 +717,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(xor)
               handleNoArguments(xor)
               handleSend(x, xor)
-            endBinaryExpression(+)
+            endBinaryExpression(+, x)
             handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'xor' is written as '^' instead of the written out word., Try replacing 'xor' with '^'., {string: xor, string2: ^}], xor, xor)
             beginBinaryExpression(^)
               handleIdentifier(y, expression)
@@ -726,8 +726,8 @@ beginCompilationUnit(abstract)
               handleSend(y, +)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(^)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(^, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -768,7 +768,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(^)
               handleNoArguments(^)
               handleSend(x, ^)
-            endBinaryExpression(+)
+            endBinaryExpression(+, x)
             beginBinaryExpression(^)
               handleIdentifier(y, expression)
               handleNoTypeArguments(+)
@@ -776,8 +776,8 @@ beginCompilationUnit(abstract)
               handleSend(y, +)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(^)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(^, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -820,7 +820,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(xor)
                   handleNoArguments(xor)
                   handleSend(x, xor)
-                endBinaryExpression(+)
+                endBinaryExpression(+, x)
                 handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'xor' is written as '^' instead of the written out word., Try replacing 'xor' with '^'., {string: xor, string2: ^}], xor, xor)
                 beginBinaryExpression(^)
                   handleIdentifier(y, expression)
@@ -829,8 +829,8 @@ beginCompilationUnit(abstract)
                   handleSend(y, +)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(^)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(^, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -874,7 +874,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(^)
                   handleNoArguments(^)
                   handleSend(x, ^)
-                endBinaryExpression(+)
+                endBinaryExpression(+, x)
                 beginBinaryExpression(^)
                   handleIdentifier(y, expression)
                   handleNoTypeArguments(+)
@@ -882,8 +882,8 @@ beginCompilationUnit(abstract)
                   handleSend(y, +)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(^)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(^, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -931,7 +931,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
                 handleIdentifier(x, expression)
                 handleNoTypeArguments(xor)
                 handleNoArguments(xor)
@@ -942,10 +942,10 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments())
                   handleNoArguments())
                   handleSend(y, ))
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
               endArguments(2, (, ))
               handleSend(s, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(s, ;)
               handleIdentifier(s, expression)
               handleNoTypeArguments(()
               beginArguments(()
@@ -958,7 +958,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
                 handleIdentifier(x, expression)
                 handleNoTypeArguments(^)
                 handleNoArguments(^)
@@ -968,10 +968,10 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments())
                   handleNoArguments())
                   handleSend(y, ))
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
               endArguments(2, (, ))
               handleSend(s, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(s, ;)
             endBlockFunctionBody(2, {, })
           endClassMethod(null, s, (, null, })
         endMember()
@@ -1018,7 +1018,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
               beginInitializer(bar)
@@ -1036,7 +1036,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments({)
                   handleNoArguments({)
                   handleSend(y, {)
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
             endInitializers(2, :, y)
@@ -1056,13 +1056,13 @@ beginCompilationUnit(abstract)
                     handleNoTypeArguments(})
                     handleNoArguments(})
                     handleSend(y, })
-                  endBinaryExpression(^)
+                  endBinaryExpression(^, y)
                   handleInterpolationExpression(${, })
                   handleStringPart(")
                 endLiteralString(1, ))
               endArguments(1, (, ))
               handleSend(print, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(print, ;)
             endBlockFunctionBody(1, {, })
           endClassConstructor(null, Key, (, :, })
         endMember()
@@ -1108,7 +1108,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
               beginInitializer(bar)
@@ -1125,7 +1125,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments({)
                   handleNoArguments({)
                   handleSend(y, {)
-                endBinaryExpression(^)
+                endBinaryExpression(^, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
             endInitializers(2, :, y)
@@ -1144,13 +1144,13 @@ beginCompilationUnit(abstract)
                     handleNoTypeArguments(})
                     handleNoArguments(})
                     handleSend(y, })
-                  endBinaryExpression(^)
+                  endBinaryExpression(^, y)
                   handleInterpolationExpression(${, })
                   handleStringPart(")
                 endLiteralString(1, ))
               endArguments(1, (, ))
               handleSend(print, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(print, ;)
             endBlockFunctionBody(1, {, })
           endClassConstructor(null, Key, (, :, })
         endMember()
@@ -1200,7 +1200,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(y, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(y, ;)
               handleIdentifier(x, expression)
               handleNoTypeArguments(^)
               handleNoArguments(^)
@@ -1210,8 +1210,8 @@ beginCompilationUnit(abstract)
                 handleNoTypeArguments(;)
                 handleNoArguments(;)
                 handleSend(y, ;)
-              endBinaryExpression(^)
-              handleExpressionStatement(;)
+              endBinaryExpression(^, y)
+              handleExpressionStatement(x, ;)
             endBlockFunctionBody(3, {, })
           endClassMethod(null, not_currently_working, (, null, })
         endMember()

pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect

@@ -74,7 +74,7 @@ parseUnit(abstract)
                               parseArgumentsOpt(hashCode)
                                 listener: handleNoArguments(xor)
                               listener: handleSend(hashCode, xor)
-                        listener: handleEndingBinaryExpression(.)
+                        listener: handleEndingBinaryExpression(., hashCode)
                         rewriter()
                         parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                           parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -105,8 +105,8 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(;)
                                 listener: handleSend(hashCode, ;)
-                          listener: handleEndingBinaryExpression(.)
-                        listener: endBinaryExpression(^)
+                          listener: handleEndingBinaryExpression(., hashCode)
+                        listener: endBinaryExpression(^, hashCode)
                     ensureSemicolon(hashCode)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -161,7 +161,7 @@ parseUnit(abstract)
                               parseArgumentsOpt(hashCode)
                                 listener: handleNoArguments(^)
                               listener: handleSend(hashCode, ^)
-                        listener: handleEndingBinaryExpression(.)
+                        listener: handleEndingBinaryExpression(., hashCode)
                         listener: beginBinaryExpression(^)
                         parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                           parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -178,8 +178,8 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(;)
                                 listener: handleSend(hashCode, ;)
-                          listener: handleEndingBinaryExpression(.)
-                        listener: endBinaryExpression(^)
+                          listener: handleEndingBinaryExpression(., hashCode)
+                        listener: endBinaryExpression(^, hashCode)
                     ensureSemicolon(hashCode)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -239,7 +239,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(hashCode)
                                     listener: handleNoArguments(xor)
                                   listener: handleSend(hashCode, xor)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., hashCode)
                             rewriter()
                             parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                               parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -270,8 +270,8 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(;)
                                     listener: handleSend(hashCode, ;)
-                              listener: handleEndingBinaryExpression(.)
-                            listener: endBinaryExpression(^)
+                              listener: handleEndingBinaryExpression(., hashCode)
+                            listener: endBinaryExpression(^, hashCode)
                         ensureSemicolon(hashCode)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -333,7 +333,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(hashCode)
                                     listener: handleNoArguments(^)
                                   listener: handleSend(hashCode, ^)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., hashCode)
                             listener: beginBinaryExpression(^)
                             parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                               parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -350,8 +350,8 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(;)
                                     listener: handleSend(hashCode, ;)
-                              listener: handleEndingBinaryExpression(.)
-                            listener: endBinaryExpression(^)
+                              listener: handleEndingBinaryExpression(., hashCode)
+                            listener: endBinaryExpression(^, hashCode)
                         ensureSemicolon(hashCode)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -414,9 +414,9 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(xor)
                                 listener: handleSend(hashCode, xor)
-                          listener: handleEndingBinaryExpression(.)
+                          listener: handleEndingBinaryExpression(., hashCode)
                           rewriter()
-                        listener: endBinaryExpression(+)
+                        listener: endBinaryExpression(+, hashCode)
                         rewriter()
                         parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                           parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -451,15 +451,15 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(+)
                                 listener: handleSend(hashCode, +)
-                          listener: handleEndingBinaryExpression(.)
+                          listener: handleEndingBinaryExpression(., hashCode)
                           listener: beginBinaryExpression(+)
                           parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                             parseUnaryExpression(+, true, ConstantPatternContext.none)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(^)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(^, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -520,8 +520,8 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(^)
                                 listener: handleSend(hashCode, ^)
-                          listener: handleEndingBinaryExpression(.)
-                        listener: endBinaryExpression(+)
+                          listener: handleEndingBinaryExpression(., hashCode)
+                        listener: endBinaryExpression(+, hashCode)
                         listener: beginBinaryExpression(^)
                         parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                           parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -538,15 +538,15 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(+)
                                 listener: handleSend(hashCode, +)
-                          listener: handleEndingBinaryExpression(.)
+                          listener: handleEndingBinaryExpression(., hashCode)
                           listener: beginBinaryExpression(+)
                           parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                             parseUnaryExpression(+, true, ConstantPatternContext.none)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(^)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(^, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -612,9 +612,9 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(xor)
                                     listener: handleSend(hashCode, xor)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., hashCode)
                               rewriter()
-                            listener: endBinaryExpression(+)
+                            listener: endBinaryExpression(+, hashCode)
                             rewriter()
                             parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                               parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -649,15 +649,15 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(+)
                                     listener: handleSend(hashCode, +)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., hashCode)
                               listener: beginBinaryExpression(+)
                               parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                                 parseUnaryExpression(+, true, ConstantPatternContext.none)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(^)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(^, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -725,8 +725,8 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(^)
                                     listener: handleSend(hashCode, ^)
-                              listener: handleEndingBinaryExpression(.)
-                            listener: endBinaryExpression(+)
+                              listener: handleEndingBinaryExpression(., hashCode)
+                            listener: endBinaryExpression(+, hashCode)
                             listener: beginBinaryExpression(^)
                             parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                               parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -743,15 +743,15 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(+)
                                     listener: handleSend(hashCode, +)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., hashCode)
                               listener: beginBinaryExpression(+)
                               parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                                 parseUnaryExpression(+, true, ConstantPatternContext.none)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(^)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(^, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -850,7 +850,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(y)
                                     listener: handleNoArguments(;)
                                   listener: handleSend(y, ;)
-                        listener: endBinaryExpression(^)
+                        listener: endBinaryExpression(^, y)
                     ensureSemicolon(y)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -935,7 +935,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(y)
                                     listener: handleNoArguments(;)
                                   listener: handleSend(y, ;)
-                        listener: endBinaryExpression(^)
+                        listener: endBinaryExpression(^, y)
                     ensureSemicolon(y)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -1037,7 +1037,7 @@ parseUnit(abstract)
                                       parseArgumentsOpt(y)
                                         listener: handleNoArguments(;)
                                       listener: handleSend(y, ;)
-                            listener: endBinaryExpression(^)
+                            listener: endBinaryExpression(^, y)
                         ensureSemicolon(y)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1129,7 +1129,7 @@ parseUnit(abstract)
                                       parseArgumentsOpt(y)
                                         listener: handleNoArguments(;)
                                       listener: handleSend(y, ;)
-                            listener: endBinaryExpression(^)
+                            listener: endBinaryExpression(^, y)
                         ensureSemicolon(y)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1246,7 +1246,7 @@ parseUnit(abstract)
                                             parseArgumentsOpt(y)
                                               listener: handleNoArguments(;)
                                             listener: handleSend(y, ;)
-                                  listener: endBinaryExpression(^)
+                                  listener: endBinaryExpression(^, y)
                               listener: endVariableInitializer(=)
                             listener: endInitializedIdentifier(z)
                           ensureSemicolon(y)
@@ -1373,7 +1373,7 @@ parseUnit(abstract)
                                             parseArgumentsOpt(y)
                                               listener: handleNoArguments(;)
                                             listener: handleSend(y, ;)
-                                  listener: endBinaryExpression(^)
+                                  listener: endBinaryExpression(^, y)
                               listener: endVariableInitializer(=)
                             listener: endInitializedIdentifier(z)
                           ensureSemicolon(y)
@@ -1476,7 +1476,7 @@ parseUnit(abstract)
                                     listener: handleNoArguments(xor)
                                   listener: handleSend(x, xor)
                           rewriter()
-                        listener: endBinaryExpression(+)
+                        listener: endBinaryExpression(+, x)
                         rewriter()
                         parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                           parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -1512,8 +1512,8 @@ parseUnit(abstract)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(^)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(^, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -1591,7 +1591,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(x)
                                     listener: handleNoArguments(^)
                                   listener: handleSend(x, ^)
-                        listener: endBinaryExpression(+)
+                        listener: endBinaryExpression(+, x)
                         listener: beginBinaryExpression(^)
                         parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                           parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -1611,8 +1611,8 @@ parseUnit(abstract)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(^)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(^, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -1696,7 +1696,7 @@ parseUnit(abstract)
                                         listener: handleNoArguments(xor)
                                       listener: handleSend(x, xor)
                               rewriter()
-                            listener: endBinaryExpression(+)
+                            listener: endBinaryExpression(+, x)
                             rewriter()
                             parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                               parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -1732,8 +1732,8 @@ parseUnit(abstract)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(^)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(^, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1818,7 +1818,7 @@ parseUnit(abstract)
                                       parseArgumentsOpt(x)
                                         listener: handleNoArguments(^)
                                       listener: handleSend(x, ^)
-                            listener: endBinaryExpression(+)
+                            listener: endBinaryExpression(+, x)
                             listener: beginBinaryExpression(^)
                             parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                               parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -1838,8 +1838,8 @@ parseUnit(abstract)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(^)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(^, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1958,7 +1958,7 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments(,)
                                                           listener: handleSend(y, ,)
-                                                listener: endBinaryExpression(^)
+                                                listener: endBinaryExpression(^, y)
                                             parseExpression(,)
                                               parsePrecedenceExpression(,, 1, true, ConstantPatternContext.none)
                                                 parseUnaryExpression(,, true, ConstantPatternContext.none)
@@ -1997,11 +1997,11 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments())
                                                           listener: handleSend(y, ))
-                                                listener: endBinaryExpression(^)
+                                                listener: endBinaryExpression(^, y)
                                             listener: endArguments(2, (, ))
                                       listener: handleSend(s, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(s, ;)
                   notEofOrValue(}, s)
                   parseStatement(;)
                     parseStatementX(;)
@@ -2049,7 +2049,7 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments(,)
                                                           listener: handleSend(y, ,)
-                                                listener: endBinaryExpression(^)
+                                                listener: endBinaryExpression(^, y)
                                             parseExpression(,)
                                               parsePrecedenceExpression(,, 1, true, ConstantPatternContext.none)
                                                 parseUnaryExpression(,, true, ConstantPatternContext.none)
@@ -2076,11 +2076,11 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments())
                                                           listener: handleSend(y, ))
-                                                listener: endBinaryExpression(^)
+                                                listener: endBinaryExpression(^, y)
                                             listener: endArguments(2, (, ))
                                       listener: handleSend(s, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(s, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(2, {, })
                 listener: endClassMethod(null, s, (, null, })
@@ -2185,7 +2185,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments(,)
                                         listener: handleSend(y, ,)
-                              listener: endBinaryExpression(^)
+                              listener: endBinaryExpression(^, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     parseInitializer(,)
@@ -2241,7 +2241,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments({)
                                         listener: handleSend(y, {)
-                              listener: endBinaryExpression(^)
+                              listener: endBinaryExpression(^, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     listener: endInitializers(2, :, y)
@@ -2317,7 +2317,7 @@ parseUnit(abstract)
                                                                       parseArgumentsOpt(y)
                                                                         listener: handleNoArguments(})
                                                                       listener: handleSend(y, })
-                                                            listener: endBinaryExpression(^)
+                                                            listener: endBinaryExpression(^, y)
                                                         listener: handleInterpolationExpression(${, })
                                                         parseStringPart(})
                                                           listener: handleStringPart(")
@@ -2325,7 +2325,7 @@ parseUnit(abstract)
                                             listener: endArguments(1, (, ))
                                       listener: handleSend(print, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(print, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(1, {, })
                 listener: endClassConstructor(null, Key, (, :, })
@@ -2418,7 +2418,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments(,)
                                         listener: handleSend(y, ,)
-                              listener: endBinaryExpression(^)
+                              listener: endBinaryExpression(^, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     parseInitializer(,)
@@ -2462,7 +2462,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments({)
                                         listener: handleSend(y, {)
-                              listener: endBinaryExpression(^)
+                              listener: endBinaryExpression(^, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     listener: endInitializers(2, :, y)
@@ -2526,7 +2526,7 @@ parseUnit(abstract)
                                                                       parseArgumentsOpt(y)
                                                                         listener: handleNoArguments(})
                                                                       listener: handleSend(y, })
-                                                            listener: endBinaryExpression(^)
+                                                            listener: endBinaryExpression(^, y)
                                                         listener: handleInterpolationExpression(${, })
                                                         parseStringPart(})
                                                           listener: handleStringPart(")
@@ -2534,7 +2534,7 @@ parseUnit(abstract)
                                             listener: endArguments(1, (, ))
                                       listener: handleSend(print, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(print, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(1, {, })
                 listener: endClassConstructor(null, Key, (, :, })
@@ -2635,7 +2635,7 @@ parseUnit(abstract)
                                         listener: handleNoArguments(;)
                                       listener: handleSend(y, ;)
                           ensureSemicolon(y)
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(y, ;)
                   notEofOrValue(}, x)
                   parseStatement(;)
                     parseStatementX(;)
@@ -2668,9 +2668,9 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments(;)
                                         listener: handleSend(y, ;)
-                              listener: endBinaryExpression(^)
+                              listener: endBinaryExpression(^, y)
                           ensureSemicolon(y)
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(x, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(3, {, })
                 listener: endClassMethod(null, not_currently_working, (, null, })

pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect

@@ -93,7 +93,7 @@ beginCompilationUnit(abstract)
             handleNoTypeArguments(and)
             handleNoArguments(and)
             handleSend(hashCode, and)
-            handleEndingBinaryExpression(.)
+            handleEndingBinaryExpression(., hashCode)
             handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&' instead of the written out word., Try replacing 'and' with '&'., {string: and, string2: &}], and, and)
             beginBinaryExpression(&)
               handleLiteralNull(null)
@@ -101,8 +101,8 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(hashCode, ;)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(&)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(&, hashCode)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -126,15 +126,15 @@ beginCompilationUnit(abstract)
             handleNoTypeArguments(&)
             handleNoArguments(&)
             handleSend(hashCode, &)
-            handleEndingBinaryExpression(.)
+            handleEndingBinaryExpression(., hashCode)
             beginBinaryExpression(&)
               handleLiteralNull(null)
               handleIdentifier(hashCode, expressionContinuation)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(hashCode, ;)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(&)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(&, hashCode)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -160,7 +160,7 @@ beginCompilationUnit(abstract)
                 handleNoTypeArguments(and)
                 handleNoArguments(and)
                 handleSend(hashCode, and)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., hashCode)
                 handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&' instead of the written out word., Try replacing 'and' with '&'., {string: and, string2: &}], and, and)
                 beginBinaryExpression(&)
                   handleLiteralNull(null)
@@ -168,8 +168,8 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(hashCode, ;)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(&)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(&, hashCode)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -196,15 +196,15 @@ beginCompilationUnit(abstract)
                 handleNoTypeArguments(&)
                 handleNoArguments(&)
                 handleSend(hashCode, &)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., hashCode)
                 beginBinaryExpression(&)
                   handleLiteralNull(null)
                   handleIdentifier(hashCode, expressionContinuation)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(hashCode, ;)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(&)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(&, hashCode)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -231,8 +231,8 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(and)
               handleNoArguments(and)
               handleSend(hashCode, and)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(+)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(+, hashCode)
             handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&' instead of the written out word., Try replacing 'and' with '&'., {string: and, string2: &}], and, and)
             beginBinaryExpression(&)
               handleLiteralNull(null)
@@ -240,11 +240,11 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(+)
               handleNoArguments(+)
               handleSend(hashCode, +)
-              handleEndingBinaryExpression(.)
+              handleEndingBinaryExpression(., hashCode)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(&)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(&, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -270,19 +270,19 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(&)
               handleNoArguments(&)
               handleSend(hashCode, &)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(+)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(+, hashCode)
             beginBinaryExpression(&)
               handleLiteralNull(null)
               handleIdentifier(hashCode, expressionContinuation)
               handleNoTypeArguments(+)
               handleNoArguments(+)
               handleSend(hashCode, +)
-              handleEndingBinaryExpression(.)
+              handleEndingBinaryExpression(., hashCode)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(&)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(&, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -310,8 +310,8 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(and)
                   handleNoArguments(and)
                   handleSend(hashCode, and)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(+)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(+, hashCode)
                 handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&' instead of the written out word., Try replacing 'and' with '&'., {string: and, string2: &}], and, and)
                 beginBinaryExpression(&)
                   handleLiteralNull(null)
@@ -319,11 +319,11 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(+)
                   handleNoArguments(+)
                   handleSend(hashCode, +)
-                  handleEndingBinaryExpression(.)
+                  handleEndingBinaryExpression(., hashCode)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(&)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(&, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -352,19 +352,19 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(&)
                   handleNoArguments(&)
                   handleSend(hashCode, &)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(+)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(+, hashCode)
                 beginBinaryExpression(&)
                   handleLiteralNull(null)
                   handleIdentifier(hashCode, expressionContinuation)
                   handleNoTypeArguments(+)
                   handleNoArguments(+)
                   handleSend(hashCode, +)
-                  handleEndingBinaryExpression(.)
+                  handleEndingBinaryExpression(., hashCode)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(&)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(&, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -410,7 +410,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(y, ;)
-            endBinaryExpression(&)
+            endBinaryExpression(&, y)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -454,7 +454,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(y, ;)
-            endBinaryExpression(&)
+            endBinaryExpression(&, y)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -501,7 +501,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(y, ;)
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -548,7 +548,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(y, ;)
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -604,7 +604,7 @@ beginCompilationUnit(abstract)
                       handleNoTypeArguments(;)
                       handleNoArguments(;)
                       handleSend(y, ;)
-                    endBinaryExpression(&)
+                    endBinaryExpression(&, y)
                   endVariableInitializer(=)
                 endInitializedIdentifier(z)
               endVariablesDeclaration(1, ;)
@@ -667,7 +667,7 @@ beginCompilationUnit(abstract)
                       handleNoTypeArguments(;)
                       handleNoArguments(;)
                       handleSend(y, ;)
-                    endBinaryExpression(&)
+                    endBinaryExpression(&, y)
                   endVariableInitializer(=)
                 endInitializedIdentifier(z)
               endVariablesDeclaration(1, ;)
@@ -717,7 +717,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(and)
               handleNoArguments(and)
               handleSend(x, and)
-            endBinaryExpression(+)
+            endBinaryExpression(+, x)
             handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&' instead of the written out word., Try replacing 'and' with '&'., {string: and, string2: &}], and, and)
             beginBinaryExpression(&)
               handleIdentifier(y, expression)
@@ -726,8 +726,8 @@ beginCompilationUnit(abstract)
               handleSend(y, +)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(&)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(&, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -768,7 +768,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(&)
               handleNoArguments(&)
               handleSend(x, &)
-            endBinaryExpression(+)
+            endBinaryExpression(+, x)
             beginBinaryExpression(&)
               handleIdentifier(y, expression)
               handleNoTypeArguments(+)
@@ -776,8 +776,8 @@ beginCompilationUnit(abstract)
               handleSend(y, +)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(&)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(&, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -820,7 +820,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(and)
                   handleNoArguments(and)
                   handleSend(x, and)
-                endBinaryExpression(+)
+                endBinaryExpression(+, x)
                 handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&' instead of the written out word., Try replacing 'and' with '&'., {string: and, string2: &}], and, and)
                 beginBinaryExpression(&)
                   handleIdentifier(y, expression)
@@ -829,8 +829,8 @@ beginCompilationUnit(abstract)
                   handleSend(y, +)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(&)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(&, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -874,7 +874,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(&)
                   handleNoArguments(&)
                   handleSend(x, &)
-                endBinaryExpression(+)
+                endBinaryExpression(+, x)
                 beginBinaryExpression(&)
                   handleIdentifier(y, expression)
                   handleNoTypeArguments(+)
@@ -882,8 +882,8 @@ beginCompilationUnit(abstract)
                   handleSend(y, +)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(&)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(&, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -931,7 +931,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
                 handleIdentifier(x, expression)
                 handleNoTypeArguments(and)
                 handleNoArguments(and)
@@ -942,10 +942,10 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments())
                   handleNoArguments())
                   handleSend(y, ))
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
               endArguments(2, (, ))
               handleSend(s, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(s, ;)
               handleIdentifier(s, expression)
               handleNoTypeArguments(()
               beginArguments(()
@@ -958,7 +958,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
                 handleIdentifier(x, expression)
                 handleNoTypeArguments(&)
                 handleNoArguments(&)
@@ -968,10 +968,10 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments())
                   handleNoArguments())
                   handleSend(y, ))
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
               endArguments(2, (, ))
               handleSend(s, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(s, ;)
             endBlockFunctionBody(2, {, })
           endClassMethod(null, s, (, null, })
         endMember()
@@ -1018,7 +1018,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
               beginInitializer(bar)
@@ -1036,7 +1036,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments({)
                   handleNoArguments({)
                   handleSend(y, {)
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
             endInitializers(2, :, y)
@@ -1056,13 +1056,13 @@ beginCompilationUnit(abstract)
                     handleNoTypeArguments(})
                     handleNoArguments(})
                     handleSend(y, })
-                  endBinaryExpression(&)
+                  endBinaryExpression(&, y)
                   handleInterpolationExpression(${, })
                   handleStringPart(")
                 endLiteralString(1, ))
               endArguments(1, (, ))
               handleSend(print, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(print, ;)
             endBlockFunctionBody(1, {, })
           endClassConstructor(null, Key, (, :, })
         endMember()
@@ -1108,7 +1108,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
               beginInitializer(bar)
@@ -1125,7 +1125,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments({)
                   handleNoArguments({)
                   handleSend(y, {)
-                endBinaryExpression(&)
+                endBinaryExpression(&, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
             endInitializers(2, :, y)
@@ -1144,13 +1144,13 @@ beginCompilationUnit(abstract)
                     handleNoTypeArguments(})
                     handleNoArguments(})
                     handleSend(y, })
-                  endBinaryExpression(&)
+                  endBinaryExpression(&, y)
                   handleInterpolationExpression(${, })
                   handleStringPart(")
                 endLiteralString(1, ))
               endArguments(1, (, ))
               handleSend(print, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(print, ;)
             endBlockFunctionBody(1, {, })
           endClassConstructor(null, Key, (, :, })
         endMember()
@@ -1200,7 +1200,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(y, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(y, ;)
               handleIdentifier(x, expression)
               handleNoTypeArguments(&)
               handleNoArguments(&)
@@ -1210,8 +1210,8 @@ beginCompilationUnit(abstract)
                 handleNoTypeArguments(;)
                 handleNoArguments(;)
                 handleSend(y, ;)
-              endBinaryExpression(&)
-              handleExpressionStatement(;)
+              endBinaryExpression(&, y)
+              handleExpressionStatement(x, ;)
             endBlockFunctionBody(3, {, })
           endClassMethod(null, not_currently_working, (, null, })
         endMember()

pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect

@@ -74,7 +74,7 @@ parseUnit(abstract)
                               parseArgumentsOpt(hashCode)
                                 listener: handleNoArguments(and)
                               listener: handleSend(hashCode, and)
-                        listener: handleEndingBinaryExpression(.)
+                        listener: handleEndingBinaryExpression(., hashCode)
                         rewriter()
                         parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                           parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -105,8 +105,8 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(;)
                                 listener: handleSend(hashCode, ;)
-                          listener: handleEndingBinaryExpression(.)
-                        listener: endBinaryExpression(&)
+                          listener: handleEndingBinaryExpression(., hashCode)
+                        listener: endBinaryExpression(&, hashCode)
                     ensureSemicolon(hashCode)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -161,7 +161,7 @@ parseUnit(abstract)
                               parseArgumentsOpt(hashCode)
                                 listener: handleNoArguments(&)
                               listener: handleSend(hashCode, &)
-                        listener: handleEndingBinaryExpression(.)
+                        listener: handleEndingBinaryExpression(., hashCode)
                         listener: beginBinaryExpression(&)
                         parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                           parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -178,8 +178,8 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(;)
                                 listener: handleSend(hashCode, ;)
-                          listener: handleEndingBinaryExpression(.)
-                        listener: endBinaryExpression(&)
+                          listener: handleEndingBinaryExpression(., hashCode)
+                        listener: endBinaryExpression(&, hashCode)
                     ensureSemicolon(hashCode)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -239,7 +239,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(hashCode)
                                     listener: handleNoArguments(and)
                                   listener: handleSend(hashCode, and)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., hashCode)
                             rewriter()
                             parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                               parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -270,8 +270,8 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(;)
                                     listener: handleSend(hashCode, ;)
-                              listener: handleEndingBinaryExpression(.)
-                            listener: endBinaryExpression(&)
+                              listener: handleEndingBinaryExpression(., hashCode)
+                            listener: endBinaryExpression(&, hashCode)
                         ensureSemicolon(hashCode)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -333,7 +333,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(hashCode)
                                     listener: handleNoArguments(&)
                                   listener: handleSend(hashCode, &)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., hashCode)
                             listener: beginBinaryExpression(&)
                             parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                               parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -350,8 +350,8 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(;)
                                     listener: handleSend(hashCode, ;)
-                              listener: handleEndingBinaryExpression(.)
-                            listener: endBinaryExpression(&)
+                              listener: handleEndingBinaryExpression(., hashCode)
+                            listener: endBinaryExpression(&, hashCode)
                         ensureSemicolon(hashCode)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -414,10 +414,10 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(and)
                                 listener: handleSend(hashCode, and)
-                          listener: handleEndingBinaryExpression(.)
+                          listener: handleEndingBinaryExpression(., hashCode)
                           rewriter()
                           rewriter()
-                        listener: endBinaryExpression(+)
+                        listener: endBinaryExpression(+, hashCode)
                         rewriter()
                         parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                           parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -452,15 +452,15 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(+)
                                 listener: handleSend(hashCode, +)
-                          listener: handleEndingBinaryExpression(.)
+                          listener: handleEndingBinaryExpression(., hashCode)
                           listener: beginBinaryExpression(+)
                           parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                             parseUnaryExpression(+, true, ConstantPatternContext.none)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(&)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(&, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -521,8 +521,8 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(&)
                                 listener: handleSend(hashCode, &)
-                          listener: handleEndingBinaryExpression(.)
-                        listener: endBinaryExpression(+)
+                          listener: handleEndingBinaryExpression(., hashCode)
+                        listener: endBinaryExpression(+, hashCode)
                         listener: beginBinaryExpression(&)
                         parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                           parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -539,15 +539,15 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(+)
                                 listener: handleSend(hashCode, +)
-                          listener: handleEndingBinaryExpression(.)
+                          listener: handleEndingBinaryExpression(., hashCode)
                           listener: beginBinaryExpression(+)
                           parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                             parseUnaryExpression(+, true, ConstantPatternContext.none)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(&)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(&, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -613,10 +613,10 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(and)
                                     listener: handleSend(hashCode, and)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., hashCode)
                               rewriter()
                               rewriter()
-                            listener: endBinaryExpression(+)
+                            listener: endBinaryExpression(+, hashCode)
                             rewriter()
                             parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                               parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -651,15 +651,15 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(+)
                                     listener: handleSend(hashCode, +)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., hashCode)
                               listener: beginBinaryExpression(+)
                               parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                                 parseUnaryExpression(+, true, ConstantPatternContext.none)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(&)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(&, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -727,8 +727,8 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(&)
                                     listener: handleSend(hashCode, &)
-                              listener: handleEndingBinaryExpression(.)
-                            listener: endBinaryExpression(+)
+                              listener: handleEndingBinaryExpression(., hashCode)
+                            listener: endBinaryExpression(+, hashCode)
                             listener: beginBinaryExpression(&)
                             parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                               parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -745,15 +745,15 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(+)
                                     listener: handleSend(hashCode, +)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., hashCode)
                               listener: beginBinaryExpression(+)
                               parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                                 parseUnaryExpression(+, true, ConstantPatternContext.none)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(&)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(&, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -852,7 +852,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(y)
                                     listener: handleNoArguments(;)
                                   listener: handleSend(y, ;)
-                        listener: endBinaryExpression(&)
+                        listener: endBinaryExpression(&, y)
                     ensureSemicolon(y)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -937,7 +937,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(y)
                                     listener: handleNoArguments(;)
                                   listener: handleSend(y, ;)
-                        listener: endBinaryExpression(&)
+                        listener: endBinaryExpression(&, y)
                     ensureSemicolon(y)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -1039,7 +1039,7 @@ parseUnit(abstract)
                                       parseArgumentsOpt(y)
                                         listener: handleNoArguments(;)
                                       listener: handleSend(y, ;)
-                            listener: endBinaryExpression(&)
+                            listener: endBinaryExpression(&, y)
                         ensureSemicolon(y)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1131,7 +1131,7 @@ parseUnit(abstract)
                                       parseArgumentsOpt(y)
                                         listener: handleNoArguments(;)
                                       listener: handleSend(y, ;)
-                            listener: endBinaryExpression(&)
+                            listener: endBinaryExpression(&, y)
                         ensureSemicolon(y)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1248,7 +1248,7 @@ parseUnit(abstract)
                                             parseArgumentsOpt(y)
                                               listener: handleNoArguments(;)
                                             listener: handleSend(y, ;)
-                                  listener: endBinaryExpression(&)
+                                  listener: endBinaryExpression(&, y)
                               listener: endVariableInitializer(=)
                             listener: endInitializedIdentifier(z)
                           ensureSemicolon(y)
@@ -1375,7 +1375,7 @@ parseUnit(abstract)
                                             parseArgumentsOpt(y)
                                               listener: handleNoArguments(;)
                                             listener: handleSend(y, ;)
-                                  listener: endBinaryExpression(&)
+                                  listener: endBinaryExpression(&, y)
                               listener: endVariableInitializer(=)
                             listener: endInitializedIdentifier(z)
                           ensureSemicolon(y)
@@ -1479,7 +1479,7 @@ parseUnit(abstract)
                                   listener: handleSend(x, and)
                           rewriter()
                           rewriter()
-                        listener: endBinaryExpression(+)
+                        listener: endBinaryExpression(+, x)
                         rewriter()
                         parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                           parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -1515,8 +1515,8 @@ parseUnit(abstract)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(&)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(&, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -1594,7 +1594,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(x)
                                     listener: handleNoArguments(&)
                                   listener: handleSend(x, &)
-                        listener: endBinaryExpression(+)
+                        listener: endBinaryExpression(+, x)
                         listener: beginBinaryExpression(&)
                         parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                           parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -1614,8 +1614,8 @@ parseUnit(abstract)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(&)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(&, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -1700,7 +1700,7 @@ parseUnit(abstract)
                                       listener: handleSend(x, and)
                               rewriter()
                               rewriter()
-                            listener: endBinaryExpression(+)
+                            listener: endBinaryExpression(+, x)
                             rewriter()
                             parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                               parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -1736,8 +1736,8 @@ parseUnit(abstract)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(&)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(&, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1822,7 +1822,7 @@ parseUnit(abstract)
                                       parseArgumentsOpt(x)
                                         listener: handleNoArguments(&)
                                       listener: handleSend(x, &)
-                            listener: endBinaryExpression(+)
+                            listener: endBinaryExpression(+, x)
                             listener: beginBinaryExpression(&)
                             parsePrecedenceExpression(&, 12, true, ConstantPatternContext.none)
                               parseUnaryExpression(&, true, ConstantPatternContext.none)
@@ -1842,8 +1842,8 @@ parseUnit(abstract)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(&)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(&, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1962,7 +1962,7 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments(,)
                                                           listener: handleSend(y, ,)
-                                                listener: endBinaryExpression(&)
+                                                listener: endBinaryExpression(&, y)
                                             parseExpression(,)
                                               parsePrecedenceExpression(,, 1, true, ConstantPatternContext.none)
                                                 parseUnaryExpression(,, true, ConstantPatternContext.none)
@@ -2001,11 +2001,11 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments())
                                                           listener: handleSend(y, ))
-                                                listener: endBinaryExpression(&)
+                                                listener: endBinaryExpression(&, y)
                                             listener: endArguments(2, (, ))
                                       listener: handleSend(s, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(s, ;)
                   notEofOrValue(}, s)
                   parseStatement(;)
                     parseStatementX(;)
@@ -2053,7 +2053,7 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments(,)
                                                           listener: handleSend(y, ,)
-                                                listener: endBinaryExpression(&)
+                                                listener: endBinaryExpression(&, y)
                                             parseExpression(,)
                                               parsePrecedenceExpression(,, 1, true, ConstantPatternContext.none)
                                                 parseUnaryExpression(,, true, ConstantPatternContext.none)
@@ -2080,11 +2080,11 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments())
                                                           listener: handleSend(y, ))
-                                                listener: endBinaryExpression(&)
+                                                listener: endBinaryExpression(&, y)
                                             listener: endArguments(2, (, ))
                                       listener: handleSend(s, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(s, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(2, {, })
                 listener: endClassMethod(null, s, (, null, })
@@ -2189,7 +2189,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments(,)
                                         listener: handleSend(y, ,)
-                              listener: endBinaryExpression(&)
+                              listener: endBinaryExpression(&, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     parseInitializer(,)
@@ -2245,7 +2245,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments({)
                                         listener: handleSend(y, {)
-                              listener: endBinaryExpression(&)
+                              listener: endBinaryExpression(&, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     listener: endInitializers(2, :, y)
@@ -2321,7 +2321,7 @@ parseUnit(abstract)
                                                                       parseArgumentsOpt(y)
                                                                         listener: handleNoArguments(})
                                                                       listener: handleSend(y, })
-                                                            listener: endBinaryExpression(&)
+                                                            listener: endBinaryExpression(&, y)
                                                         listener: handleInterpolationExpression(${, })
                                                         parseStringPart(})
                                                           listener: handleStringPart(")
@@ -2329,7 +2329,7 @@ parseUnit(abstract)
                                             listener: endArguments(1, (, ))
                                       listener: handleSend(print, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(print, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(1, {, })
                 listener: endClassConstructor(null, Key, (, :, })
@@ -2422,7 +2422,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments(,)
                                         listener: handleSend(y, ,)
-                              listener: endBinaryExpression(&)
+                              listener: endBinaryExpression(&, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     parseInitializer(,)
@@ -2466,7 +2466,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments({)
                                         listener: handleSend(y, {)
-                              listener: endBinaryExpression(&)
+                              listener: endBinaryExpression(&, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     listener: endInitializers(2, :, y)
@@ -2530,7 +2530,7 @@ parseUnit(abstract)
                                                                       parseArgumentsOpt(y)
                                                                         listener: handleNoArguments(})
                                                                       listener: handleSend(y, })
-                                                            listener: endBinaryExpression(&)
+                                                            listener: endBinaryExpression(&, y)
                                                         listener: handleInterpolationExpression(${, })
                                                         parseStringPart(})
                                                           listener: handleStringPart(")
@@ -2538,7 +2538,7 @@ parseUnit(abstract)
                                             listener: endArguments(1, (, ))
                                       listener: handleSend(print, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(print, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(1, {, })
                 listener: endClassConstructor(null, Key, (, :, })
@@ -2639,7 +2639,7 @@ parseUnit(abstract)
                                         listener: handleNoArguments(;)
                                       listener: handleSend(y, ;)
                           ensureSemicolon(y)
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(y, ;)
                   notEofOrValue(}, x)
                   parseStatement(;)
                     parseStatementX(;)
@@ -2672,9 +2672,9 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments(;)
                                         listener: handleSend(y, ;)
-                              listener: endBinaryExpression(&)
+                              listener: endBinaryExpression(&, y)
                           ensureSemicolon(y)
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(x, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(3, {, })
                 listener: endClassMethod(null, not_currently_working, (, null, })

pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect

@@ -93,7 +93,7 @@ beginCompilationUnit(abstract)
             handleNoTypeArguments(or)
             handleNoArguments(or)
             handleSend(hashCode, or)
-            handleEndingBinaryExpression(.)
+            handleEndingBinaryExpression(., hashCode)
             handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '|' instead of the written out word., Try replacing 'or' with '|'., {string: or, string2: |}], or, or)
             beginBinaryExpression(|)
               handleLiteralNull(null)
@@ -101,8 +101,8 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(hashCode, ;)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(|)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(|, hashCode)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -126,15 +126,15 @@ beginCompilationUnit(abstract)
             handleNoTypeArguments(|)
             handleNoArguments(|)
             handleSend(hashCode, |)
-            handleEndingBinaryExpression(.)
+            handleEndingBinaryExpression(., hashCode)
             beginBinaryExpression(|)
               handleLiteralNull(null)
               handleIdentifier(hashCode, expressionContinuation)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(hashCode, ;)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(|)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(|, hashCode)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -160,7 +160,7 @@ beginCompilationUnit(abstract)
                 handleNoTypeArguments(or)
                 handleNoArguments(or)
                 handleSend(hashCode, or)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., hashCode)
                 handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '|' instead of the written out word., Try replacing 'or' with '|'., {string: or, string2: |}], or, or)
                 beginBinaryExpression(|)
                   handleLiteralNull(null)
@@ -168,8 +168,8 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(hashCode, ;)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(|)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(|, hashCode)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -196,15 +196,15 @@ beginCompilationUnit(abstract)
                 handleNoTypeArguments(|)
                 handleNoArguments(|)
                 handleSend(hashCode, |)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., hashCode)
                 beginBinaryExpression(|)
                   handleLiteralNull(null)
                   handleIdentifier(hashCode, expressionContinuation)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(hashCode, ;)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(|)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(|, hashCode)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -231,8 +231,8 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(or)
               handleNoArguments(or)
               handleSend(hashCode, or)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(+)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(+, hashCode)
             handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '|' instead of the written out word., Try replacing 'or' with '|'., {string: or, string2: |}], or, or)
             beginBinaryExpression(|)
               handleLiteralNull(null)
@@ -240,11 +240,11 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(+)
               handleNoArguments(+)
               handleSend(hashCode, +)
-              handleEndingBinaryExpression(.)
+              handleEndingBinaryExpression(., hashCode)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(|)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(|, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -270,19 +270,19 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(|)
               handleNoArguments(|)
               handleSend(hashCode, |)
-              handleEndingBinaryExpression(.)
-            endBinaryExpression(+)
+              handleEndingBinaryExpression(., hashCode)
+            endBinaryExpression(+, hashCode)
             beginBinaryExpression(|)
               handleLiteralNull(null)
               handleIdentifier(hashCode, expressionContinuation)
               handleNoTypeArguments(+)
               handleNoArguments(+)
               handleSend(hashCode, +)
-              handleEndingBinaryExpression(.)
+              handleEndingBinaryExpression(., hashCode)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(|)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(|, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(get, int, =>, null, ;)
         endMember()
@@ -310,8 +310,8 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(or)
                   handleNoArguments(or)
                   handleSend(hashCode, or)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(+)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(+, hashCode)
                 handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '|' instead of the written out word., Try replacing 'or' with '|'., {string: or, string2: |}], or, or)
                 beginBinaryExpression(|)
                   handleLiteralNull(null)
@@ -319,11 +319,11 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(+)
                   handleNoArguments(+)
                   handleSend(hashCode, +)
-                  handleEndingBinaryExpression(.)
+                  handleEndingBinaryExpression(., hashCode)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(|)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(|, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -352,19 +352,19 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(|)
                   handleNoArguments(|)
                   handleSend(hashCode, |)
-                  handleEndingBinaryExpression(.)
-                endBinaryExpression(+)
+                  handleEndingBinaryExpression(., hashCode)
+                endBinaryExpression(+, hashCode)
                 beginBinaryExpression(|)
                   handleLiteralNull(null)
                   handleIdentifier(hashCode, expressionContinuation)
                   handleNoTypeArguments(+)
                   handleNoArguments(+)
                   handleSend(hashCode, +)
-                  handleEndingBinaryExpression(.)
+                  handleEndingBinaryExpression(., hashCode)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(|)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(|, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(get, int, {, null, })
@@ -410,7 +410,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(y, ;)
-            endBinaryExpression(|)
+            endBinaryExpression(|, y)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -454,7 +454,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(y, ;)
-            endBinaryExpression(|)
+            endBinaryExpression(|, y)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -501,7 +501,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(y, ;)
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -548,7 +548,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(;)
                   handleNoArguments(;)
                   handleSend(y, ;)
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -604,7 +604,7 @@ beginCompilationUnit(abstract)
                       handleNoTypeArguments(;)
                       handleNoArguments(;)
                       handleSend(y, ;)
-                    endBinaryExpression(|)
+                    endBinaryExpression(|, y)
                   endVariableInitializer(=)
                 endInitializedIdentifier(z)
               endVariablesDeclaration(1, ;)
@@ -667,7 +667,7 @@ beginCompilationUnit(abstract)
                       handleNoTypeArguments(;)
                       handleNoArguments(;)
                       handleSend(y, ;)
-                    endBinaryExpression(|)
+                    endBinaryExpression(|, y)
                   endVariableInitializer(=)
                 endInitializedIdentifier(z)
               endVariablesDeclaration(1, ;)
@@ -717,7 +717,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(or)
               handleNoArguments(or)
               handleSend(x, or)
-            endBinaryExpression(+)
+            endBinaryExpression(+, x)
             handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '|' instead of the written out word., Try replacing 'or' with '|'., {string: or, string2: |}], or, or)
             beginBinaryExpression(|)
               handleIdentifier(y, expression)
@@ -726,8 +726,8 @@ beginCompilationUnit(abstract)
               handleSend(y, +)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(|)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(|, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -768,7 +768,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(|)
               handleNoArguments(|)
               handleSend(x, |)
-            endBinaryExpression(+)
+            endBinaryExpression(+, x)
             beginBinaryExpression(|)
               handleIdentifier(y, expression)
               handleNoTypeArguments(+)
@@ -776,8 +776,8 @@ beginCompilationUnit(abstract)
               handleSend(y, +)
               beginBinaryExpression(+)
                 handleLiteralInt(3)
-              endBinaryExpression(+)
-            endBinaryExpression(|)
+              endBinaryExpression(+, 3)
+            endBinaryExpression(|, 3)
             handleExpressionFunctionBody(=>, ;)
           endClassMethod(null, int, (, null, ;)
         endMember()
@@ -820,7 +820,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(or)
                   handleNoArguments(or)
                   handleSend(x, or)
-                endBinaryExpression(+)
+                endBinaryExpression(+, x)
                 handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '|' instead of the written out word., Try replacing 'or' with '|'., {string: or, string2: |}], or, or)
                 beginBinaryExpression(|)
                   handleIdentifier(y, expression)
@@ -829,8 +829,8 @@ beginCompilationUnit(abstract)
                   handleSend(y, +)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(|)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(|, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -874,7 +874,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(|)
                   handleNoArguments(|)
                   handleSend(x, |)
-                endBinaryExpression(+)
+                endBinaryExpression(+, x)
                 beginBinaryExpression(|)
                   handleIdentifier(y, expression)
                   handleNoTypeArguments(+)
@@ -882,8 +882,8 @@ beginCompilationUnit(abstract)
                   handleSend(y, +)
                   beginBinaryExpression(+)
                     handleLiteralInt(3)
-                  endBinaryExpression(+)
-                endBinaryExpression(|)
+                  endBinaryExpression(+, 3)
+                endBinaryExpression(|, 3)
               endReturnStatement(true, return, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, int, (, null, })
@@ -931,7 +931,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
                 handleIdentifier(x, expression)
                 handleNoTypeArguments(or)
                 handleNoArguments(or)
@@ -942,10 +942,10 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments())
                   handleNoArguments())
                   handleSend(y, ))
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
               endArguments(2, (, ))
               handleSend(s, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(s, ;)
               handleIdentifier(s, expression)
               handleNoTypeArguments(()
               beginArguments(()
@@ -958,7 +958,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
                 handleIdentifier(x, expression)
                 handleNoTypeArguments(|)
                 handleNoArguments(|)
@@ -968,10 +968,10 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments())
                   handleNoArguments())
                   handleSend(y, ))
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
               endArguments(2, (, ))
               handleSend(s, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(s, ;)
             endBlockFunctionBody(2, {, })
           endClassMethod(null, s, (, null, })
         endMember()
@@ -1018,7 +1018,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
               beginInitializer(bar)
@@ -1036,7 +1036,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments({)
                   handleNoArguments({)
                   handleSend(y, {)
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
             endInitializers(2, :, y)
@@ -1056,13 +1056,13 @@ beginCompilationUnit(abstract)
                     handleNoTypeArguments(})
                     handleNoArguments(})
                     handleSend(y, })
-                  endBinaryExpression(|)
+                  endBinaryExpression(|, y)
                   handleInterpolationExpression(${, })
                   handleStringPart(")
                 endLiteralString(1, ))
               endArguments(1, (, ))
               handleSend(print, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(print, ;)
             endBlockFunctionBody(1, {, })
           endClassConstructor(null, Key, (, :, })
         endMember()
@@ -1108,7 +1108,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments(,)
                   handleNoArguments(,)
                   handleSend(y, ,)
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
               beginInitializer(bar)
@@ -1125,7 +1125,7 @@ beginCompilationUnit(abstract)
                   handleNoTypeArguments({)
                   handleNoArguments({)
                   handleSend(y, {)
-                endBinaryExpression(|)
+                endBinaryExpression(|, y)
                 handleAssignmentExpression(=)
               endInitializer(y)
             endInitializers(2, :, y)
@@ -1144,13 +1144,13 @@ beginCompilationUnit(abstract)
                     handleNoTypeArguments(})
                     handleNoArguments(})
                     handleSend(y, })
-                  endBinaryExpression(|)
+                  endBinaryExpression(|, y)
                   handleInterpolationExpression(${, })
                   handleStringPart(")
                 endLiteralString(1, ))
               endArguments(1, (, ))
               handleSend(print, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(print, ;)
             endBlockFunctionBody(1, {, })
           endClassConstructor(null, Key, (, :, })
         endMember()
@@ -1200,7 +1200,7 @@ beginCompilationUnit(abstract)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(y, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(y, ;)
               handleIdentifier(x, expression)
               handleNoTypeArguments(|)
               handleNoArguments(|)
@@ -1210,8 +1210,8 @@ beginCompilationUnit(abstract)
                 handleNoTypeArguments(;)
                 handleNoArguments(;)
                 handleSend(y, ;)
-              endBinaryExpression(|)
-              handleExpressionStatement(;)
+              endBinaryExpression(|, y)
+              handleExpressionStatement(x, ;)
             endBlockFunctionBody(3, {, })
           endClassMethod(null, not_currently_working, (, null, })
         endMember()

pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect

@@ -74,7 +74,7 @@ parseUnit(abstract)
                               parseArgumentsOpt(hashCode)
                                 listener: handleNoArguments(or)
                               listener: handleSend(hashCode, or)
-                        listener: handleEndingBinaryExpression(.)
+                        listener: handleEndingBinaryExpression(., hashCode)
                         rewriter()
                         parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                           parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -105,8 +105,8 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(;)
                                 listener: handleSend(hashCode, ;)
-                          listener: handleEndingBinaryExpression(.)
-                        listener: endBinaryExpression(|)
+                          listener: handleEndingBinaryExpression(., hashCode)
+                        listener: endBinaryExpression(|, hashCode)
                     ensureSemicolon(hashCode)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -161,7 +161,7 @@ parseUnit(abstract)
                               parseArgumentsOpt(hashCode)
                                 listener: handleNoArguments(|)
                               listener: handleSend(hashCode, |)
-                        listener: handleEndingBinaryExpression(.)
+                        listener: handleEndingBinaryExpression(., hashCode)
                         listener: beginBinaryExpression(|)
                         parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                           parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -178,8 +178,8 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(;)
                                 listener: handleSend(hashCode, ;)
-                          listener: handleEndingBinaryExpression(.)
-                        listener: endBinaryExpression(|)
+                          listener: handleEndingBinaryExpression(., hashCode)
+                        listener: endBinaryExpression(|, hashCode)
                     ensureSemicolon(hashCode)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -239,7 +239,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(hashCode)
                                     listener: handleNoArguments(or)
                                   listener: handleSend(hashCode, or)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., hashCode)
                             rewriter()
                             parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                               parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -270,8 +270,8 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(;)
                                     listener: handleSend(hashCode, ;)
-                              listener: handleEndingBinaryExpression(.)
-                            listener: endBinaryExpression(|)
+                              listener: handleEndingBinaryExpression(., hashCode)
+                            listener: endBinaryExpression(|, hashCode)
                         ensureSemicolon(hashCode)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -333,7 +333,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(hashCode)
                                     listener: handleNoArguments(|)
                                   listener: handleSend(hashCode, |)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., hashCode)
                             listener: beginBinaryExpression(|)
                             parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                               parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -350,8 +350,8 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(;)
                                     listener: handleSend(hashCode, ;)
-                              listener: handleEndingBinaryExpression(.)
-                            listener: endBinaryExpression(|)
+                              listener: handleEndingBinaryExpression(., hashCode)
+                            listener: endBinaryExpression(|, hashCode)
                         ensureSemicolon(hashCode)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -414,10 +414,10 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(or)
                                 listener: handleSend(hashCode, or)
-                          listener: handleEndingBinaryExpression(.)
+                          listener: handleEndingBinaryExpression(., hashCode)
                           rewriter()
                           rewriter()
-                        listener: endBinaryExpression(+)
+                        listener: endBinaryExpression(+, hashCode)
                         rewriter()
                         parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                           parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -452,15 +452,15 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(+)
                                 listener: handleSend(hashCode, +)
-                          listener: handleEndingBinaryExpression(.)
+                          listener: handleEndingBinaryExpression(., hashCode)
                           listener: beginBinaryExpression(+)
                           parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                             parseUnaryExpression(+, true, ConstantPatternContext.none)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(|)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(|, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -521,8 +521,8 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(|)
                                 listener: handleSend(hashCode, |)
-                          listener: handleEndingBinaryExpression(.)
-                        listener: endBinaryExpression(+)
+                          listener: handleEndingBinaryExpression(., hashCode)
+                        listener: endBinaryExpression(+, hashCode)
                         listener: beginBinaryExpression(|)
                         parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                           parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -539,15 +539,15 @@ parseUnit(abstract)
                                 parseArgumentsOpt(hashCode)
                                   listener: handleNoArguments(+)
                                 listener: handleSend(hashCode, +)
-                          listener: handleEndingBinaryExpression(.)
+                          listener: handleEndingBinaryExpression(., hashCode)
                           listener: beginBinaryExpression(+)
                           parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                             parseUnaryExpression(+, true, ConstantPatternContext.none)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(|)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(|, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -613,10 +613,10 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(or)
                                     listener: handleSend(hashCode, or)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., hashCode)
                               rewriter()
                               rewriter()
-                            listener: endBinaryExpression(+)
+                            listener: endBinaryExpression(+, hashCode)
                             rewriter()
                             parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                               parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -651,15 +651,15 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(+)
                                     listener: handleSend(hashCode, +)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., hashCode)
                               listener: beginBinaryExpression(+)
                               parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                                 parseUnaryExpression(+, true, ConstantPatternContext.none)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(|)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(|, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -727,8 +727,8 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(|)
                                     listener: handleSend(hashCode, |)
-                              listener: handleEndingBinaryExpression(.)
-                            listener: endBinaryExpression(+)
+                              listener: handleEndingBinaryExpression(., hashCode)
+                            listener: endBinaryExpression(+, hashCode)
                             listener: beginBinaryExpression(|)
                             parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                               parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -745,15 +745,15 @@ parseUnit(abstract)
                                     parseArgumentsOpt(hashCode)
                                       listener: handleNoArguments(+)
                                     listener: handleSend(hashCode, +)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., hashCode)
                               listener: beginBinaryExpression(+)
                               parsePrecedenceExpression(+, 14, true, ConstantPatternContext.none)
                                 parseUnaryExpression(+, true, ConstantPatternContext.none)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(|)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(|, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -852,7 +852,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(y)
                                     listener: handleNoArguments(;)
                                   listener: handleSend(y, ;)
-                        listener: endBinaryExpression(|)
+                        listener: endBinaryExpression(|, y)
                     ensureSemicolon(y)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -937,7 +937,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(y)
                                     listener: handleNoArguments(;)
                                   listener: handleSend(y, ;)
-                        listener: endBinaryExpression(|)
+                        listener: endBinaryExpression(|, y)
                     ensureSemicolon(y)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -1039,7 +1039,7 @@ parseUnit(abstract)
                                       parseArgumentsOpt(y)
                                         listener: handleNoArguments(;)
                                       listener: handleSend(y, ;)
-                            listener: endBinaryExpression(|)
+                            listener: endBinaryExpression(|, y)
                         ensureSemicolon(y)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1131,7 +1131,7 @@ parseUnit(abstract)
                                       parseArgumentsOpt(y)
                                         listener: handleNoArguments(;)
                                       listener: handleSend(y, ;)
-                            listener: endBinaryExpression(|)
+                            listener: endBinaryExpression(|, y)
                         ensureSemicolon(y)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1248,7 +1248,7 @@ parseUnit(abstract)
                                             parseArgumentsOpt(y)
                                               listener: handleNoArguments(;)
                                             listener: handleSend(y, ;)
-                                  listener: endBinaryExpression(|)
+                                  listener: endBinaryExpression(|, y)
                               listener: endVariableInitializer(=)
                             listener: endInitializedIdentifier(z)
                           ensureSemicolon(y)
@@ -1375,7 +1375,7 @@ parseUnit(abstract)
                                             parseArgumentsOpt(y)
                                               listener: handleNoArguments(;)
                                             listener: handleSend(y, ;)
-                                  listener: endBinaryExpression(|)
+                                  listener: endBinaryExpression(|, y)
                               listener: endVariableInitializer(=)
                             listener: endInitializedIdentifier(z)
                           ensureSemicolon(y)
@@ -1479,7 +1479,7 @@ parseUnit(abstract)
                                   listener: handleSend(x, or)
                           rewriter()
                           rewriter()
-                        listener: endBinaryExpression(+)
+                        listener: endBinaryExpression(+, x)
                         rewriter()
                         parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                           parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -1515,8 +1515,8 @@ parseUnit(abstract)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(|)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(|, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -1594,7 +1594,7 @@ parseUnit(abstract)
                                   parseArgumentsOpt(x)
                                     listener: handleNoArguments(|)
                                   listener: handleSend(x, |)
-                        listener: endBinaryExpression(+)
+                        listener: endBinaryExpression(+, x)
                         listener: beginBinaryExpression(|)
                         parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                           parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -1614,8 +1614,8 @@ parseUnit(abstract)
                               parsePrimary(+, expression, ConstantPatternContext.none)
                                 parseLiteralInt(+)
                                   listener: handleLiteralInt(3)
-                          listener: endBinaryExpression(+)
-                        listener: endBinaryExpression(|)
+                          listener: endBinaryExpression(+, 3)
+                        listener: endBinaryExpression(|, 3)
                     ensureSemicolon(3)
                     listener: handleExpressionFunctionBody(=>, ;)
                     inGenerator()
@@ -1700,7 +1700,7 @@ parseUnit(abstract)
                                       listener: handleSend(x, or)
                               rewriter()
                               rewriter()
-                            listener: endBinaryExpression(+)
+                            listener: endBinaryExpression(+, x)
                             rewriter()
                             parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                               parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -1736,8 +1736,8 @@ parseUnit(abstract)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(|)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(|, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1822,7 +1822,7 @@ parseUnit(abstract)
                                       parseArgumentsOpt(x)
                                         listener: handleNoArguments(|)
                                       listener: handleSend(x, |)
-                            listener: endBinaryExpression(+)
+                            listener: endBinaryExpression(+, x)
                             listener: beginBinaryExpression(|)
                             parsePrecedenceExpression(|, 10, true, ConstantPatternContext.none)
                               parseUnaryExpression(|, true, ConstantPatternContext.none)
@@ -1842,8 +1842,8 @@ parseUnit(abstract)
                                   parsePrimary(+, expression, ConstantPatternContext.none)
                                     parseLiteralInt(+)
                                       listener: handleLiteralInt(3)
-                              listener: endBinaryExpression(+)
-                            listener: endBinaryExpression(|)
+                              listener: endBinaryExpression(+, 3)
+                            listener: endBinaryExpression(|, 3)
                         ensureSemicolon(3)
                         listener: endReturnStatement(true, return, ;)
                         inGenerator()
@@ -1962,7 +1962,7 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments(,)
                                                           listener: handleSend(y, ,)
-                                                listener: endBinaryExpression(|)
+                                                listener: endBinaryExpression(|, y)
                                             parseExpression(,)
                                               parsePrecedenceExpression(,, 1, true, ConstantPatternContext.none)
                                                 parseUnaryExpression(,, true, ConstantPatternContext.none)
@@ -2001,11 +2001,11 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments())
                                                           listener: handleSend(y, ))
-                                                listener: endBinaryExpression(|)
+                                                listener: endBinaryExpression(|, y)
                                             listener: endArguments(2, (, ))
                                       listener: handleSend(s, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(s, ;)
                   notEofOrValue(}, s)
                   parseStatement(;)
                     parseStatementX(;)
@@ -2053,7 +2053,7 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments(,)
                                                           listener: handleSend(y, ,)
-                                                listener: endBinaryExpression(|)
+                                                listener: endBinaryExpression(|, y)
                                             parseExpression(,)
                                               parsePrecedenceExpression(,, 1, true, ConstantPatternContext.none)
                                                 parseUnaryExpression(,, true, ConstantPatternContext.none)
@@ -2080,11 +2080,11 @@ parseUnit(abstract)
                                                           parseArgumentsOpt(y)
                                                             listener: handleNoArguments())
                                                           listener: handleSend(y, ))
-                                                listener: endBinaryExpression(|)
+                                                listener: endBinaryExpression(|, y)
                                             listener: endArguments(2, (, ))
                                       listener: handleSend(s, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(s, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(2, {, })
                 listener: endClassMethod(null, s, (, null, })
@@ -2189,7 +2189,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments(,)
                                         listener: handleSend(y, ,)
-                              listener: endBinaryExpression(|)
+                              listener: endBinaryExpression(|, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     parseInitializer(,)
@@ -2245,7 +2245,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments({)
                                         listener: handleSend(y, {)
-                              listener: endBinaryExpression(|)
+                              listener: endBinaryExpression(|, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     listener: endInitializers(2, :, y)
@@ -2321,7 +2321,7 @@ parseUnit(abstract)
                                                                       parseArgumentsOpt(y)
                                                                         listener: handleNoArguments(})
                                                                       listener: handleSend(y, })
-                                                            listener: endBinaryExpression(|)
+                                                            listener: endBinaryExpression(|, y)
                                                         listener: handleInterpolationExpression(${, })
                                                         parseStringPart(})
                                                           listener: handleStringPart(")
@@ -2329,7 +2329,7 @@ parseUnit(abstract)
                                             listener: endArguments(1, (, ))
                                       listener: handleSend(print, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(print, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(1, {, })
                 listener: endClassConstructor(null, Key, (, :, })
@@ -2422,7 +2422,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments(,)
                                         listener: handleSend(y, ,)
-                              listener: endBinaryExpression(|)
+                              listener: endBinaryExpression(|, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     parseInitializer(,)
@@ -2466,7 +2466,7 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments({)
                                         listener: handleSend(y, {)
-                              listener: endBinaryExpression(|)
+                              listener: endBinaryExpression(|, y)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(y)
                     listener: endInitializers(2, :, y)
@@ -2530,7 +2530,7 @@ parseUnit(abstract)
                                                                       parseArgumentsOpt(y)
                                                                         listener: handleNoArguments(})
                                                                       listener: handleSend(y, })
-                                                            listener: endBinaryExpression(|)
+                                                            listener: endBinaryExpression(|, y)
                                                         listener: handleInterpolationExpression(${, })
                                                         parseStringPart(})
                                                           listener: handleStringPart(")
@@ -2538,7 +2538,7 @@ parseUnit(abstract)
                                             listener: endArguments(1, (, ))
                                       listener: handleSend(print, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(print, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(1, {, })
                 listener: endClassConstructor(null, Key, (, :, })
@@ -2639,7 +2639,7 @@ parseUnit(abstract)
                                         listener: handleNoArguments(;)
                                       listener: handleSend(y, ;)
                           ensureSemicolon(y)
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(y, ;)
                   notEofOrValue(}, x)
                   parseStatement(;)
                     parseStatementX(;)
@@ -2672,9 +2672,9 @@ parseUnit(abstract)
                                         parseArgumentsOpt(y)
                                           listener: handleNoArguments(;)
                                         listener: handleSend(y, ;)
-                              listener: endBinaryExpression(|)
+                              listener: endBinaryExpression(|, y)
                           ensureSemicolon(y)
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(x, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(3, {, })
                 listener: endClassMethod(null, not_currently_working, (, null, })

pkg/front_end/parser_testcases/error_recovery/issue_38415.crash_dart.expect

@@ -59,11 +59,11 @@ beginCompilationUnit(f)
               handleLiteralList(0, [, null, ])
             endArguments(1, (, ))
             handleSend(R, })
-          endBinaryExpression(<)
+          endBinaryExpression(<, ))
         endArguments(1, (, ))
         handleSend(m, })
         handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], Z, Z)
-        handleExpressionStatement(;)
+        handleExpressionStatement(m, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(f, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_38415.crash_dart.intertwined.expect

@@ -96,7 +96,7 @@ parseUnit(UnmatchedToken(())
                                                                     listener: handleLiteralList(0, [, null, ])
                                                         listener: endArguments(1, (, ))
                                                   listener: handleSend(R, })
-                                        listener: endBinaryExpression(<)
+                                        listener: endBinaryExpression(<, ))
                                     ensureCloseParen(), ()
                                       rewriter()
                                     listener: endArguments(1, (, ))
@@ -105,7 +105,7 @@ parseUnit(UnmatchedToken(())
                     reportRecoverableError(Z, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                       listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], Z, Z)
                     rewriter()
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(m, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(f, null, })

pkg/front_end/parser_testcases/error_recovery/issue_39058.crash_dart.expect

@@ -28,7 +28,7 @@ beginCompilationUnit({)
         handleType(, null)
       endTypeArguments(1, <, >)
       handleLiteralList(0, [, null, ])
-      handleExpressionStatement(;)
+      handleExpressionStatement(<, ;)
     endBlock(1, {, }, BlockKind(invalid))
     handleInvalidTopLevelBlock({)
     handleInvalidTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_39058.crash_dart.intertwined.expect

@@ -43,7 +43,7 @@ parseUnit(UnmatchedToken(())
                     ensureSemicolon(])
                       reportRecoverableError((, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                       rewriter()
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(<, ;)
           notEofOrValue(}, })
           listener: endBlock(1, {, }, BlockKind(invalid))
         listener: handleInvalidTopLevelBlock({)

pkg/front_end/parser_testcases/error_recovery/issue_39058_prime.crash_dart.expect

@@ -16,7 +16,7 @@ beginCompilationUnit({)
         handleType(, null)
       endTypeArguments(1, <, >)
       handleLiteralList(0, [, null, ])
-      handleExpressionStatement(;)
+      handleExpressionStatement(<, ;)
     endBlock(1, {, }, BlockKind(invalid))
     handleInvalidTopLevelBlock({)
     handleInvalidTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_39058_prime.crash_dart.intertwined.expect

@@ -43,7 +43,7 @@ parseUnit({)
                     ensureSemicolon(])
                       reportRecoverableError(>, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                       rewriter()
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(<, ;)
           notEofOrValue(}, })
           listener: endBlock(1, {, }, BlockKind(invalid))
         listener: handleInvalidTopLevelBlock({)

pkg/front_end/parser_testcases/error_recovery/issue_39060.dart.expect

@@ -50,7 +50,7 @@ beginCompilationUnit(main)
           handleRecoverableError(Message[ExpectedButGot, Expected '[' before this., null, {string: [}], }, })
           handleLiteralList(0, [, null, ])
           handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], >, >)
-          handleExpressionStatement(;)
+          handleExpressionStatement(<, ;)
         endBlock(2, {, }, BlockKind(statement))
       endBlockFunctionBody(1, {, )
     endTopLevelMethod(main, null, )

pkg/front_end/parser_testcases/error_recovery/issue_39060.dart.intertwined.expect

@@ -88,7 +88,7 @@ parseUnit(main)
                             reportRecoverableError(>, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                               listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], >, >)
                             rewriter()
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(<, ;)
                 notEofOrValue(}, })
                 listener: endBlock(2, {, }, BlockKind(statement))
           notEofOrValue(}, )

pkg/front_end/parser_testcases/error_recovery/issue_42267.dart.expect

@@ -37,14 +37,14 @@ beginCompilationUnit(void)
           handleNoTypeArguments([)
           handleNoArguments([)
           handleSend(foo, [)
-          handleEndingBinaryExpression(..)
+          handleEndingBinaryExpression(.., foo)
           handleIdentifier(bar, expression)
           handleNoTypeArguments(])
           handleNoArguments(])
           handleSend(bar, ])
           handleIndexedExpression(null, [, ])
         endCascade()
-        handleExpressionStatement(;)
+        handleExpressionStatement(builder, ;)
         handleIdentifier(FilterSet, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -69,7 +69,7 @@ beginCompilationUnit(void)
               handleNoTypeArguments([)
               handleNoArguments([)
               handleSend(foo, [)
-              handleEndingBinaryExpression(..)
+              handleEndingBinaryExpression(.., foo)
               handleIdentifier(bar, expression)
               handleNoTypeArguments(])
               handleNoArguments(])
@@ -80,7 +80,7 @@ beginCompilationUnit(void)
           endFunctionExpression((, ])
         endArguments(1, (, ))
         handleSend(FilterSet, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(FilterSet, ;)
         handleIdentifier(builder, expression)
         handleNoTypeArguments(..)
         handleNoArguments(..)
@@ -90,7 +90,7 @@ beginCompilationUnit(void)
           handleNoTypeArguments([])
           handleNoArguments([])
           handleSend(foo, [])
-          handleEndingBinaryExpression(..)
+          handleEndingBinaryExpression(.., foo)
           handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got ']'., Try inserting an identifier before ']'., {lexeme: ]}], ], ])
           handleIdentifier(, expression)
           handleNoTypeArguments(])
@@ -98,7 +98,7 @@ beginCompilationUnit(void)
           handleSend(, ])
           handleIndexedExpression(null, [, ])
         endCascade()
-        handleExpressionStatement(;)
+        handleExpressionStatement(builder, ;)
         handleIdentifier(FilterSet, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -123,7 +123,7 @@ beginCompilationUnit(void)
               handleNoTypeArguments([])
               handleNoArguments([])
               handleSend(foo, [])
-              handleEndingBinaryExpression(..)
+              handleEndingBinaryExpression(.., foo)
               handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got ']'., Try inserting an identifier before ']'., {lexeme: ]}], ], ])
               handleIdentifier(, expression)
               handleNoTypeArguments(])
@@ -135,7 +135,7 @@ beginCompilationUnit(void)
           endFunctionExpression((, ])
         endArguments(1, (, ))
         handleSend(FilterSet, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(FilterSet, ;)
         handleIdentifier(builder, expression)
         handleNoTypeArguments(..)
         handleNoArguments(..)
@@ -145,7 +145,7 @@ beginCompilationUnit(void)
           handleNoTypeArguments([)
           handleNoArguments([)
           handleSend(foo, [)
-          handleEndingBinaryExpression(..)
+          handleEndingBinaryExpression(.., foo)
           handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got ']'., Try inserting an identifier before ']'., {lexeme: ]}], ], ])
           handleIdentifier(, expression)
           handleNoTypeArguments(])
@@ -153,7 +153,7 @@ beginCompilationUnit(void)
           handleSend(, ])
           handleIndexedExpression(null, [, ])
         endCascade()
-        handleExpressionStatement(;)
+        handleExpressionStatement(builder, ;)
         handleIdentifier(FilterSet, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -178,7 +178,7 @@ beginCompilationUnit(void)
               handleNoTypeArguments([)
               handleNoArguments([)
               handleSend(foo, [)
-              handleEndingBinaryExpression(..)
+              handleEndingBinaryExpression(.., foo)
               handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got ']'., Try inserting an identifier before ']'., {lexeme: ]}], ], ])
               handleIdentifier(, expression)
               handleNoTypeArguments(])
@@ -190,7 +190,7 @@ beginCompilationUnit(void)
           endFunctionExpression((, ])
         endArguments(1, (, ))
         handleSend(FilterSet, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(FilterSet, ;)
       endBlockFunctionBody(6, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_42267.dart.intertwined.expect

@@ -54,7 +54,7 @@ parseUnit(void)
                           parseArgumentsOpt(foo)
                             listener: handleNoArguments([)
                           listener: handleSend(foo, [)
-                        listener: handleEndingBinaryExpression(..)
+                        listener: handleEndingBinaryExpression(.., foo)
                         parseArgumentOrIndexStar(foo, NoTypeParamOrArg(), false)
                           parseExpression([)
                             parsePrecedenceExpression([, 1, true, ConstantPatternContext.none)
@@ -73,7 +73,7 @@ parseUnit(void)
                         parseArgumentOrIndexStar(], NoTypeParamOrArg(), false)
                         listener: endCascade()
                   ensureSemicolon(])
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(builder, ;)
           notEofOrValue(}, FilterSet)
           parseStatement(;)
             parseStatementX(;)
@@ -146,7 +146,7 @@ parseUnit(void)
                                                               parseArgumentsOpt(foo)
                                                                 listener: handleNoArguments([)
                                                               listener: handleSend(foo, [)
-                                                            listener: handleEndingBinaryExpression(..)
+                                                            listener: handleEndingBinaryExpression(.., foo)
                                                             parseArgumentOrIndexStar(foo, NoTypeParamOrArg(), false)
                                                               parseExpression([)
                                                                 parsePrecedenceExpression([, 1, true, ConstantPatternContext.none)
@@ -170,7 +170,7 @@ parseUnit(void)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(FilterSet, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(FilterSet, ;)
           notEofOrValue(}, builder)
           parseStatement(;)
             parseStatementX(;)
@@ -200,7 +200,7 @@ parseUnit(void)
                           parseArgumentsOpt(foo)
                             listener: handleNoArguments([])
                           listener: handleSend(foo, [])
-                        listener: handleEndingBinaryExpression(..)
+                        listener: handleEndingBinaryExpression(.., foo)
                         rewriteSquareBrackets(foo)
                           link([, ])
                           rewriter()
@@ -224,7 +224,7 @@ parseUnit(void)
                         parseArgumentOrIndexStar(], NoTypeParamOrArg(), false)
                         listener: endCascade()
                   ensureSemicolon(])
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(builder, ;)
           notEofOrValue(}, FilterSet)
           parseStatement(;)
             parseStatementX(;)
@@ -297,7 +297,7 @@ parseUnit(void)
                                                               parseArgumentsOpt(foo)
                                                                 listener: handleNoArguments([])
                                                               listener: handleSend(foo, [])
-                                                            listener: handleEndingBinaryExpression(..)
+                                                            listener: handleEndingBinaryExpression(.., foo)
                                                             rewriteSquareBrackets(foo)
                                                               link([, ])
                                                               rewriter()
@@ -326,7 +326,7 @@ parseUnit(void)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(FilterSet, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(FilterSet, ;)
           notEofOrValue(}, builder)
           parseStatement(;)
             parseStatementX(;)
@@ -356,7 +356,7 @@ parseUnit(void)
                           parseArgumentsOpt(foo)
                             listener: handleNoArguments([)
                           listener: handleSend(foo, [)
-                        listener: handleEndingBinaryExpression(..)
+                        listener: handleEndingBinaryExpression(.., foo)
                         parseArgumentOrIndexStar(foo, NoTypeParamOrArg(), false)
                           parseExpression([)
                             parsePrecedenceExpression([, 1, true, ConstantPatternContext.none)
@@ -377,7 +377,7 @@ parseUnit(void)
                         parseArgumentOrIndexStar(], NoTypeParamOrArg(), false)
                         listener: endCascade()
                   ensureSemicolon(])
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(builder, ;)
           notEofOrValue(}, FilterSet)
           parseStatement(;)
             parseStatementX(;)
@@ -450,7 +450,7 @@ parseUnit(void)
                                                               parseArgumentsOpt(foo)
                                                                 listener: handleNoArguments([)
                                                               listener: handleSend(foo, [)
-                                                            listener: handleEndingBinaryExpression(..)
+                                                            listener: handleEndingBinaryExpression(.., foo)
                                                             parseArgumentOrIndexStar(foo, NoTypeParamOrArg(), false)
                                                               parseExpression([)
                                                                 parsePrecedenceExpression([, 1, true, ConstantPatternContext.none)
@@ -476,7 +476,7 @@ parseUnit(void)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(FilterSet, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(FilterSet, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(6, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/issue_44785.crash_dart.expect

@@ -53,7 +53,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '||' instead of the written out word., Try replacing 'or' with '||'., {string: or, string2: ||}], or, or)
           beginBinaryExpression(||)
             handleIdentifier(b, expression)
@@ -62,8 +62,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(||)
+            endBinaryExpression(==, null)
+          endBinaryExpression(||, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))
@@ -113,7 +113,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&&' instead of the written out word., Try replacing 'and' with '&&'., {string: and, string2: &&}], and, and)
           beginBinaryExpression(&&)
             handleIdentifier(b, expression)
@@ -122,8 +122,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(&&)
+            endBinaryExpression(==, null)
+          endBinaryExpression(&&, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))

pkg/front_end/parser_testcases/error_recovery/issue_44785.crash_dart.intertwined.expect

@@ -86,7 +86,7 @@ parseUnit(foo)
                                     ensureIdentifier(|, expression)
                                     parseArgumentsOpt(b)
                           rewriter()
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         rewriter()
                         parsePrecedenceExpression(||, 6, true, ConstantPatternContext.none)
                           parseUnaryExpression(||, true, ConstantPatternContext.none)
@@ -122,8 +122,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(||)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(||, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)
@@ -241,7 +241,7 @@ parseUnit(foo)
                                     ensureIdentifier(&, expression)
                                     parseArgumentsOpt(b)
                           rewriter()
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         rewriter()
                         parsePrecedenceExpression(&&, 7, true, ConstantPatternContext.none)
                           parseUnaryExpression(&&, true, ConstantPatternContext.none)
@@ -277,8 +277,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(&&)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(&&, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)

pkg/front_end/parser_testcases/error_recovery/issue_44785_prime_1.crash_dart.expect

@@ -61,7 +61,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '||' instead of the written out word., Try replacing 'or' with '||'., {string: or, string2: ||}], or, or)
           beginBinaryExpression(||)
             handleIdentifier(b, expression)
@@ -70,8 +70,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(||)
+            endBinaryExpression(==, null)
+          endBinaryExpression(||, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))
@@ -129,7 +129,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '||' instead of the written out word., Try replacing 'or' with '||'., {string: or, string2: ||}], or, or)
           beginBinaryExpression(||)
             handleIdentifier(b, expression)
@@ -138,8 +138,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(||)
+            endBinaryExpression(==, null)
+          endBinaryExpression(||, null)
           handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'or' is written as '||' instead of the written out word., Try replacing 'or' with '||'., {string: or, string2: ||}], or, or)
           beginBinaryExpression(||)
             handleIdentifier(c, expression)
@@ -148,8 +148,8 @@ beginCompilationUnit(foo)
             handleSend(c, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(||)
+            endBinaryExpression(==, null)
+          endBinaryExpression(||, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))
@@ -198,7 +198,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&&' instead of the written out word., Try replacing 'and' with '&&'., {string: and, string2: &&}], and, and)
           beginBinaryExpression(&&)
             handleIdentifier(b, expression)
@@ -207,8 +207,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(&&)
+            endBinaryExpression(==, null)
+          endBinaryExpression(&&, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))
@@ -266,7 +266,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&&' instead of the written out word., Try replacing 'and' with '&&'., {string: and, string2: &&}], and, and)
           beginBinaryExpression(&&)
             handleIdentifier(b, expression)
@@ -275,8 +275,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(&&)
+            endBinaryExpression(==, null)
+          endBinaryExpression(&&, null)
           handleRecoverableError(Message[BinaryOperatorWrittenOut, Binary operator 'and' is written as '&&' instead of the written out word., Try replacing 'and' with '&&'., {string: and, string2: &&}], and, and)
           beginBinaryExpression(&&)
             handleIdentifier(c, expression)
@@ -285,8 +285,8 @@ beginCompilationUnit(foo)
             handleSend(c, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(&&)
+            endBinaryExpression(==, null)
+          endBinaryExpression(&&, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))

pkg/front_end/parser_testcases/error_recovery/issue_44785_prime_1.crash_dart.intertwined.expect

@@ -86,7 +86,7 @@ parseUnit(foo)
                                     ensureIdentifier(|, expression)
                                     parseArgumentsOpt(b)
                           rewriter()
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         rewriter()
                         parsePrecedenceExpression(||, 6, true, ConstantPatternContext.none)
                           parseUnaryExpression(||, true, ConstantPatternContext.none)
@@ -122,8 +122,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(||)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(||, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)
@@ -250,7 +250,7 @@ parseUnit(foo)
                                     ensureIdentifier(|, expression)
                                     parseArgumentsOpt(b)
                           rewriter()
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         rewriter()
                         parsePrecedenceExpression(||, 6, true, ConstantPatternContext.none)
                           parseUnaryExpression(||, true, ConstantPatternContext.none)
@@ -296,9 +296,9 @@ parseUnit(foo)
                                       ensureIdentifier(|, expression)
                                       parseArgumentsOpt(c)
                             rewriter()
-                          listener: endBinaryExpression(==)
+                          listener: endBinaryExpression(==, null)
                           rewriter()
-                        listener: endBinaryExpression(||)
+                        listener: endBinaryExpression(||, null)
                         rewriter()
                         parsePrecedenceExpression(||, 6, true, ConstantPatternContext.none)
                           parseUnaryExpression(||, true, ConstantPatternContext.none)
@@ -334,8 +334,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(||)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(||, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)
@@ -450,7 +450,7 @@ parseUnit(foo)
                                     ensureIdentifier(&, expression)
                                     parseArgumentsOpt(b)
                           rewriter()
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         rewriter()
                         parsePrecedenceExpression(&&, 7, true, ConstantPatternContext.none)
                           parseUnaryExpression(&&, true, ConstantPatternContext.none)
@@ -486,8 +486,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(&&)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(&&, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)
@@ -614,7 +614,7 @@ parseUnit(foo)
                                     ensureIdentifier(&, expression)
                                     parseArgumentsOpt(b)
                           rewriter()
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         rewriter()
                         parsePrecedenceExpression(&&, 7, true, ConstantPatternContext.none)
                           parseUnaryExpression(&&, true, ConstantPatternContext.none)
@@ -660,9 +660,9 @@ parseUnit(foo)
                                       ensureIdentifier(&, expression)
                                       parseArgumentsOpt(c)
                             rewriter()
-                          listener: endBinaryExpression(==)
+                          listener: endBinaryExpression(==, null)
                           rewriter()
-                        listener: endBinaryExpression(&&)
+                        listener: endBinaryExpression(&&, null)
                         rewriter()
                         parsePrecedenceExpression(&&, 7, true, ConstantPatternContext.none)
                           parseUnaryExpression(&&, true, ConstantPatternContext.none)
@@ -698,8 +698,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(&&)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(&&, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)

pkg/front_end/parser_testcases/error_recovery/issue_44785_prime_2.crash_dart.expect

@@ -35,7 +35,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           beginBinaryExpression(||)
             handleIdentifier(b, expression)
             handleNoTypeArguments(==)
@@ -43,8 +43,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(||)
+            endBinaryExpression(==, null)
+          endBinaryExpression(||, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))
@@ -102,7 +102,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           beginBinaryExpression(||)
             handleIdentifier(b, expression)
             handleNoTypeArguments(==)
@@ -110,8 +110,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(||)
+            endBinaryExpression(==, null)
+          endBinaryExpression(||, null)
           beginBinaryExpression(||)
             handleIdentifier(c, expression)
             handleNoTypeArguments(==)
@@ -119,8 +119,8 @@ beginCompilationUnit(foo)
             handleSend(c, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(||)
+            endBinaryExpression(==, null)
+          endBinaryExpression(||, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))
@@ -169,7 +169,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           beginBinaryExpression(&&)
             handleIdentifier(b, expression)
             handleNoTypeArguments(==)
@@ -177,8 +177,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(&&)
+            endBinaryExpression(==, null)
+          endBinaryExpression(&&, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))
@@ -236,7 +236,7 @@ beginCompilationUnit(foo)
           handleSend(a, ==)
           beginBinaryExpression(==)
             handleLiteralNull(null)
-          endBinaryExpression(==)
+          endBinaryExpression(==, null)
           beginBinaryExpression(&&)
             handleIdentifier(b, expression)
             handleNoTypeArguments(==)
@@ -244,8 +244,8 @@ beginCompilationUnit(foo)
             handleSend(b, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(&&)
+            endBinaryExpression(==, null)
+          endBinaryExpression(&&, null)
           beginBinaryExpression(&&)
             handleIdentifier(c, expression)
             handleNoTypeArguments(==)
@@ -253,8 +253,8 @@ beginCompilationUnit(foo)
             handleSend(c, ==)
             beginBinaryExpression(==)
               handleLiteralNull(null)
-            endBinaryExpression(==)
-          endBinaryExpression(&&)
+            endBinaryExpression(==, null)
+          endBinaryExpression(&&, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))

pkg/front_end/parser_testcases/error_recovery/issue_44785_prime_2.crash_dart.intertwined.expect

@@ -76,7 +76,7 @@ parseUnit(foo)
                             parsePrimary(==, expression, ConstantPatternContext.none)
                               parseLiteralNull(==)
                                 listener: handleLiteralNull(null)
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         listener: beginBinaryExpression(||)
                         parsePrecedenceExpression(||, 6, true, ConstantPatternContext.none)
                           parseUnaryExpression(||, true, ConstantPatternContext.none)
@@ -96,8 +96,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(||)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(||, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)
@@ -214,7 +214,7 @@ parseUnit(foo)
                             parsePrimary(==, expression, ConstantPatternContext.none)
                               parseLiteralNull(==)
                                 listener: handleLiteralNull(null)
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         listener: beginBinaryExpression(||)
                         parsePrecedenceExpression(||, 6, true, ConstantPatternContext.none)
                           parseUnaryExpression(||, true, ConstantPatternContext.none)
@@ -234,8 +234,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(||)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(||, null)
                         listener: beginBinaryExpression(||)
                         parsePrecedenceExpression(||, 6, true, ConstantPatternContext.none)
                           parseUnaryExpression(||, true, ConstantPatternContext.none)
@@ -255,8 +255,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(||)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(||, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)
@@ -361,7 +361,7 @@ parseUnit(foo)
                             parsePrimary(==, expression, ConstantPatternContext.none)
                               parseLiteralNull(==)
                                 listener: handleLiteralNull(null)
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         listener: beginBinaryExpression(&&)
                         parsePrecedenceExpression(&&, 7, true, ConstantPatternContext.none)
                           parseUnaryExpression(&&, true, ConstantPatternContext.none)
@@ -381,8 +381,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(&&)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(&&, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)
@@ -499,7 +499,7 @@ parseUnit(foo)
                             parsePrimary(==, expression, ConstantPatternContext.none)
                               parseLiteralNull(==)
                                 listener: handleLiteralNull(null)
-                        listener: endBinaryExpression(==)
+                        listener: endBinaryExpression(==, null)
                         listener: beginBinaryExpression(&&)
                         parsePrecedenceExpression(&&, 7, true, ConstantPatternContext.none)
                           parseUnaryExpression(&&, true, ConstantPatternContext.none)
@@ -519,8 +519,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(&&)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(&&, null)
                         listener: beginBinaryExpression(&&)
                         parsePrecedenceExpression(&&, 7, true, ConstantPatternContext.none)
                           parseUnaryExpression(&&, true, ConstantPatternContext.none)
@@ -540,8 +540,8 @@ parseUnit(foo)
                               parsePrimary(==, expression, ConstantPatternContext.none)
                                 parseLiteralNull(==)
                                   listener: handleLiteralNull(null)
-                          listener: endBinaryExpression(==)
-                        listener: endBinaryExpression(&&)
+                          listener: endBinaryExpression(==, null)
+                        listener: endBinaryExpression(&&, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)

pkg/front_end/parser_testcases/error_recovery/issue_45327.crash_dart.expect

@@ -38,7 +38,7 @@ beginCompilationUnit(main)
             handleNoArguments(})
             handleSend(or, })
             handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], or, or)
-            handleExpressionStatement(;)
+            handleExpressionStatement(or, ;)
           endThenStatement(or, ;)
         endIfStatement(if, null, ;)
       endBlockFunctionBody(1, {, })

pkg/front_end/parser_testcases/error_recovery/issue_45327.crash_dart.intertwined.expect

@@ -91,7 +91,7 @@ parseUnit(UnmatchedToken(())
                           reportRecoverableError(or, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                             listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], or, or)
                           rewriter()
-                        listener: handleExpressionStatement(;)
+                        listener: handleExpressionStatement(or, ;)
                 listener: endThenStatement(or, ;)
                 listener: endIfStatement(if, null, ;)
           notEofOrValue(}, })

pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect

@@ -68,7 +68,7 @@ beginCompilationUnit(class)
                   handleNoArguments(})
                   handleSend(or, })
                   handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], or, or)
-                  handleExpressionStatement(;)
+                  handleExpressionStatement(or, ;)
                 endThenStatement(or, ;)
               endIfStatement(if, null, ;)
             endBlockFunctionBody(1, {, })

pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect

@@ -138,7 +138,7 @@ parseUnit(UnmatchedToken(())
                                   reportRecoverableError(or, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                                     listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], or, or)
                                   rewriter()
-                                listener: handleExpressionStatement(;)
+                                listener: handleExpressionStatement(or, ;)
                         listener: endThenStatement(or, ;)
                         listener: endIfStatement(if, null, ;)
                   notEofOrValue(}, })

pkg/front_end/parser_testcases/error_recovery/issue_48288.dart.expect

@@ -37,7 +37,7 @@ beginCompilationUnit(void)
           handleNamedArgument(:)
         endArguments(2, (, ))
         handleSend(g, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(g, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_48288.dart.intertwined.expect

@@ -83,7 +83,7 @@ parseUnit(void)
                                     listener: endArguments(2, (, ))
                               listener: handleSend(g, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(g, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/issue_48288_prime.dart.expect

@@ -30,7 +30,7 @@ beginCompilationUnit(void)
           handleNamedArgument(:)
         endArguments(2, (, ))
         handleSend(g, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(g, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_48288_prime.dart.intertwined.expect

@@ -79,7 +79,7 @@ parseUnit(void)
                                     listener: endArguments(2, (, ))
                               listener: handleSend(g, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(g, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect

@@ -69,10 +69,10 @@ beginCompilationUnit(enum)
                 handleSend(x, *)
                 beginBinaryExpression(*)
                   handleLiteralInt(42)
-                endBinaryExpression(*)
+                endBinaryExpression(*, 42)
               endArguments(1, (, ))
               handleSend(print, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(print, ;)
             endBlockFunctionBody(1, {, })
           endClassMethod(null, void, (, null, })
         endMember()

pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect

@@ -140,11 +140,11 @@ parseUnit(enum)
                                                     parsePrimary(*, expression, ConstantPatternContext.none)
                                                       parseLiteralInt(*)
                                                         listener: handleLiteralInt(42)
-                                                listener: endBinaryExpression(*)
+                                                listener: endBinaryExpression(*, 42)
                                             listener: endArguments(1, (, ))
                                       listener: handleSend(print, ;)
                           ensureSemicolon())
-                          listener: handleExpressionStatement(;)
+                          listener: handleExpressionStatement(print, ;)
                   notEofOrValue(}, })
                   listener: endBlockFunctionBody(1, {, })
                 listener: endClassMethod(null, void, (, null, })

pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.expect

@@ -40,7 +40,7 @@ beginCompilationUnit(enum)
               endLiteralString(0, ))
             endArguments(1, (, ))
             handleSend(print, ;)
-            handleExpressionStatement(;)
+            handleExpressionStatement(print, ;)
             beginReturnStatement(return)
               beginLiteralString("hello")
               endLiteralString(0, ;)

pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect

@@ -94,7 +94,7 @@ parseUnit(enum)
                                         listener: endArguments(1, (, ))
                                   listener: handleSend(print, ;)
                       ensureSemicolon())
-                      listener: handleExpressionStatement(;)
+                      listener: handleExpressionStatement(print, ;)
               notEofOrValue(}, return)
               parseStatement(;)
                 parseStatementX(;)

pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect

@@ -129,7 +129,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               handleRecoverableError(Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}], ), ))
@@ -193,7 +193,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               handleRecoverableError(Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}], ), ))
@@ -208,7 +208,7 @@ beginCompilationUnit(class)
                   handleSend(x, ))
                 endArguments(1, (, ))
                 handleSend(y, ;)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., ))
               endInitializer())
             endInitializers(2, :, ))
             handleAsyncModifier(null, null)
@@ -259,7 +259,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               handleRecoverableError(Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}], ), ))
@@ -274,7 +274,7 @@ beginCompilationUnit(class)
                   handleSend(x, ))
                 endArguments(1, (, ))
                 handleSend(y, ;)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., ))
               endInitializer())
             endInitializers(2, :, ))
             handleAsyncModifier(null, null)
@@ -361,7 +361,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               handleRecoverableError(Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}], ), ))
@@ -373,7 +373,7 @@ beginCompilationUnit(class)
                 handleLiteralInt(2)
                 beginBinaryExpression(*)
                   handleLiteralInt(21)
-                endBinaryExpression(*)
+                endBinaryExpression(*, 21)
                 handleAssignmentExpression(=)
               endInitializer(21)
             endInitializers(2, :, 21)
@@ -425,7 +425,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               handleRecoverableError(Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}], ), ))
@@ -437,10 +437,10 @@ beginCompilationUnit(class)
                   handleSend(x, -)
                   beginBinaryExpression(-)
                     handleLiteralInt(1)
-                  endBinaryExpression(-)
+                  endBinaryExpression(-, 1)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
             endInitializers(2, :, ))
@@ -503,7 +503,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               handleRecoverableError(Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}], ), ))
@@ -513,14 +513,14 @@ beginCompilationUnit(class)
                 handleNoTypeArguments(=)
                 handleNoArguments(=)
                 handleSend(y, =)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., y)
                 handleIdentifier(x, expression)
                 handleNoTypeArguments(*)
                 handleNoArguments(*)
                 handleSend(x, *)
                 beginBinaryExpression(*)
                   handleLiteralInt(2)
-                endBinaryExpression(*)
+                endBinaryExpression(*, 2)
                 handleAssignmentExpression(=)
               endInitializer(2)
             endInitializers(2, :, 2)

pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect

@@ -201,7 +201,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     reportRecoverableError(), Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}])
@@ -334,7 +334,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     reportRecoverableError(), Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}])
@@ -376,7 +376,7 @@ parseUnit(class)
                                                       listener: handleSend(x, ))
                                           listener: endArguments(1, (, ))
                                     listener: handleSend(y, ;)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., ))
                           listener: endInitializer())
                     listener: endInitializers(2, :, ))
                 parseAsyncModifierOpt())
@@ -475,7 +475,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     reportRecoverableError(), Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}])
@@ -516,7 +516,7 @@ parseUnit(class)
                                                     listener: handleSend(x, ))
                                         listener: endArguments(1, (, ))
                                   listener: handleSend(y, ;)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., ))
                         listener: endInitializer())
                     listener: endInitializers(2, :, ))
                 parseAsyncModifierOpt())
@@ -678,7 +678,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     reportRecoverableError(), Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}])
@@ -711,7 +711,7 @@ parseUnit(class)
                                   parsePrimary(*, expression, ConstantPatternContext.none)
                                     parseLiteralInt(*)
                                       listener: handleLiteralInt(21)
-                              listener: endBinaryExpression(*)
+                              listener: endBinaryExpression(*, 21)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(21)
                     listener: endInitializers(2, :, 21)
@@ -811,7 +811,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     reportRecoverableError(), Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}])
@@ -840,14 +840,14 @@ parseUnit(class)
                                 parsePrimary(-, expression, ConstantPatternContext.none)
                                   parseLiteralInt(-)
                                     listener: handleLiteralInt(1)
-                            listener: endBinaryExpression(-)
+                            listener: endBinaryExpression(-, 1)
                             listener: beginBinaryExpression(>)
                             parsePrecedenceExpression(>, 9, true, ConstantPatternContext.none)
                               parseUnaryExpression(>, true, ConstantPatternContext.none)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     listener: endInitializers(2, :, ))
@@ -966,7 +966,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     reportRecoverableError(), Message[ExpectedAfterButGot, Expected ',' after this., null, {string: ,}])
@@ -991,7 +991,7 @@ parseUnit(class)
                                   parseArgumentsOpt(y)
                                     listener: handleNoArguments(=)
                                   listener: handleSend(y, =)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., y)
                             parsePrecedenceExpression(=, 1, true, ConstantPatternContext.none)
                               parseUnaryExpression(=, true, ConstantPatternContext.none)
                                 parsePrimary(=, expression, ConstantPatternContext.none)
@@ -1010,7 +1010,7 @@ parseUnit(class)
                                   parsePrimary(*, expression, ConstantPatternContext.none)
                                     parseLiteralInt(*)
                                       listener: handleLiteralInt(2)
-                              listener: endBinaryExpression(*)
+                              listener: endBinaryExpression(*, 2)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(2)
                     listener: endInitializers(2, :, 2)

pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect

@@ -103,7 +103,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               beginInitializer(super)
@@ -166,7 +166,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               beginInitializer(super)
@@ -180,7 +180,7 @@ beginCompilationUnit(class)
                   handleSend(x, ))
                 endArguments(1, (, ))
                 handleSend(y, ;)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., ))
               endInitializer())
             endInitializers(2, :, ))
             handleAsyncModifier(null, null)
@@ -231,7 +231,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               beginInitializer(this)
@@ -245,7 +245,7 @@ beginCompilationUnit(class)
                   handleSend(x, ))
                 endArguments(1, (, ))
                 handleSend(y, ;)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., ))
               endInitializer())
             endInitializers(2, :, ))
             handleAsyncModifier(null, null)
@@ -332,7 +332,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               beginInitializer(y)
@@ -343,7 +343,7 @@ beginCompilationUnit(class)
                 handleLiteralInt(2)
                 beginBinaryExpression(*)
                   handleLiteralInt(21)
-                endBinaryExpression(*)
+                endBinaryExpression(*, 21)
                 handleAssignmentExpression(=)
               endInitializer(21)
             endInitializers(2, :, 21)
@@ -395,7 +395,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               beginInitializer(assert)
@@ -406,10 +406,10 @@ beginCompilationUnit(class)
                   handleSend(x, -)
                   beginBinaryExpression(-)
                     handleLiteralInt(1)
-                  endBinaryExpression(-)
+                  endBinaryExpression(-, 1)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
             endInitializers(2, :, ))
@@ -472,7 +472,7 @@ beginCompilationUnit(class)
                   handleSend(x, >)
                   beginBinaryExpression(>)
                     handleLiteralInt(0)
-                  endBinaryExpression(>)
+                  endBinaryExpression(>, 0)
                 endAssert(assert, Assert.Initializer, (, null, ))
               endInitializer())
               beginInitializer(this)
@@ -481,14 +481,14 @@ beginCompilationUnit(class)
                 handleNoTypeArguments(=)
                 handleNoArguments(=)
                 handleSend(y, =)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., y)
                 handleIdentifier(x, expression)
                 handleNoTypeArguments(*)
                 handleNoArguments(*)
                 handleSend(x, *)
                 beginBinaryExpression(*)
                   handleLiteralInt(2)
-                endBinaryExpression(*)
+                endBinaryExpression(*, 2)
                 handleAssignmentExpression(=)
               endInitializer(2)
             endInitializers(2, :, 2)

pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect

@@ -201,7 +201,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     parseInitializer(,)
@@ -331,7 +331,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     parseInitializer(,)
@@ -370,7 +370,7 @@ parseUnit(class)
                                                       listener: handleSend(x, ))
                                           listener: endArguments(1, (, ))
                                     listener: handleSend(y, ;)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., ))
                           listener: endInitializer())
                     listener: endInitializers(2, :, ))
                 parseAsyncModifierOpt())
@@ -469,7 +469,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     parseInitializer(,)
@@ -507,7 +507,7 @@ parseUnit(class)
                                                     listener: handleSend(x, ))
                                         listener: endArguments(1, (, ))
                                   listener: handleSend(y, ;)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., ))
                         listener: endInitializer())
                     listener: endInitializers(2, :, ))
                 parseAsyncModifierOpt())
@@ -669,7 +669,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     parseInitializer(,)
@@ -699,7 +699,7 @@ parseUnit(class)
                                   parsePrimary(*, expression, ConstantPatternContext.none)
                                     parseLiteralInt(*)
                                       listener: handleLiteralInt(21)
-                              listener: endBinaryExpression(*)
+                              listener: endBinaryExpression(*, 21)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(21)
                     listener: endInitializers(2, :, 21)
@@ -799,7 +799,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     parseInitializer(,)
@@ -825,14 +825,14 @@ parseUnit(class)
                                 parsePrimary(-, expression, ConstantPatternContext.none)
                                   parseLiteralInt(-)
                                     listener: handleLiteralInt(1)
-                            listener: endBinaryExpression(-)
+                            listener: endBinaryExpression(-, 1)
                             listener: beginBinaryExpression(>)
                             parsePrecedenceExpression(>, 9, true, ConstantPatternContext.none)
                               parseUnaryExpression(>, true, ConstantPatternContext.none)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     listener: endInitializers(2, :, ))
@@ -951,7 +951,7 @@ parseUnit(class)
                                 parsePrimary(>, expression, ConstantPatternContext.none)
                                   parseLiteralInt(>)
                                     listener: handleLiteralInt(0)
-                            listener: endBinaryExpression(>)
+                            listener: endBinaryExpression(>, 0)
                         listener: endAssert(assert, Assert.Initializer, (, null, ))
                       listener: endInitializer())
                     parseInitializer(,)
@@ -973,7 +973,7 @@ parseUnit(class)
                                   parseArgumentsOpt(y)
                                     listener: handleNoArguments(=)
                                   listener: handleSend(y, =)
-                            listener: handleEndingBinaryExpression(.)
+                            listener: handleEndingBinaryExpression(., y)
                             parsePrecedenceExpression(=, 1, true, ConstantPatternContext.none)
                               parseUnaryExpression(=, true, ConstantPatternContext.none)
                                 parsePrimary(=, expression, ConstantPatternContext.none)
@@ -992,7 +992,7 @@ parseUnit(class)
                                   parsePrimary(*, expression, ConstantPatternContext.none)
                                     parseLiteralInt(*)
                                       listener: handleLiteralInt(2)
-                              listener: endBinaryExpression(*)
+                              listener: endBinaryExpression(*, 2)
                             listener: handleAssignmentExpression(=)
                         listener: endInitializer(2)
                     listener: endInitializers(2, :, 2)

pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect

@@ -277,7 +277,7 @@ beginCompilationUnit(class)
                 handleNoTypeArguments(=)
                 handleNoArguments(=)
                 handleSend(, =)
-                handleEndingBinaryExpression(.)
+                handleEndingBinaryExpression(., )
                 handleLiteralInt(0)
                 handleAssignmentExpression(=)
                 handleAssignmentExpression(=)

pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect

@@ -464,7 +464,7 @@ parseUnit(class)
                                     parseArgumentsOpt()
                                       listener: handleNoArguments(=)
                                     listener: handleSend(, =)
-                              listener: handleEndingBinaryExpression(.)
+                              listener: handleEndingBinaryExpression(., )
                               parsePrecedenceExpression(=, 1, true, ConstantPatternContext.none)
                                 parseUnaryExpression(=, true, ConstantPatternContext.none)
                                   parsePrimary(=, expression, ConstantPatternContext.none)

pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.expect

@@ -231,7 +231,7 @@ beginCompilationUnit(Future)
           handleSend(returnsFuture, ;)
           handleRecoverableError(AwaitNotAsync, await, await)
         endInvalidAwaitExpression(await, ), AwaitNotAsync)
-        handleExpressionStatement(;)
+        handleExpressionStatement(await, ;)
         beginIfStatement(if)
           beginAwaitExpression(await)
             handleIdentifier(returnsFuture, expression)
@@ -278,7 +278,7 @@ beginCompilationUnit(Future)
           endInvalidAwaitExpression(await, ), AwaitNotAsync)
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         handleIdentifier(xor, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -308,7 +308,7 @@ beginCompilationUnit(Future)
           endInvalidAwaitExpression(await, ), AwaitNotAsync)
         endArguments(3, (, ))
         handleSend(xor, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(xor, ;)
         beginAwaitExpression(await)
           handleIdentifier(returnsFuture, expression)
           handleNoTypeArguments(()
@@ -326,8 +326,8 @@ beginCompilationUnit(Future)
             handleSend(returnsFuture, ;)
             handleRecoverableError(AwaitNotAsync, await, await)
           endInvalidAwaitExpression(await, ), AwaitNotAsync)
-        endBinaryExpression(^)
-        handleExpressionStatement(;)
+        endBinaryExpression(^, ))
+        handleExpressionStatement(await, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -348,10 +348,10 @@ beginCompilationUnit(Future)
               handleSend(returnsFuture, ))
               handleRecoverableError(AwaitNotAsync, await, await)
             endInvalidAwaitExpression(await, ), AwaitNotAsync)
-          endBinaryExpression(^)
+          endBinaryExpression(^, ))
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         beginAwaitExpression(await)
           handleIdentifier(returnsFuture, expression)
           handleNoTypeArguments(()
@@ -369,8 +369,8 @@ beginCompilationUnit(Future)
             handleSend(returnsFuture, ;)
             handleRecoverableError(AwaitNotAsync, await, await)
           endInvalidAwaitExpression(await, ), AwaitNotAsync)
-        endBinaryExpression(+)
-        handleExpressionStatement(;)
+        endBinaryExpression(+, ))
+        handleExpressionStatement(await, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -391,10 +391,10 @@ beginCompilationUnit(Future)
               handleSend(returnsFuture, ))
               handleRecoverableError(AwaitNotAsync, await, await)
             endInvalidAwaitExpression(await, ), AwaitNotAsync)
-          endBinaryExpression(+)
+          endBinaryExpression(+, ))
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         beginAwaitExpression(await)
           handleIdentifier(returnsFuture, expression)
           handleNoTypeArguments(()
@@ -412,8 +412,8 @@ beginCompilationUnit(Future)
             handleSend(returnsFuture, ;)
             handleRecoverableError(AwaitNotAsync, await, await)
           endInvalidAwaitExpression(await, ), AwaitNotAsync)
-        endBinaryExpression(-)
-        handleExpressionStatement(;)
+        endBinaryExpression(-, ))
+        handleExpressionStatement(await, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -434,10 +434,10 @@ beginCompilationUnit(Future)
               handleSend(returnsFuture, ))
               handleRecoverableError(AwaitNotAsync, await, await)
             endInvalidAwaitExpression(await, ), AwaitNotAsync)
-          endBinaryExpression(-)
+          endBinaryExpression(-, ))
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         beginAwaitExpression(await)
           handleIdentifier(returnsFuture, expression)
           handleNoTypeArguments(()
@@ -457,8 +457,8 @@ beginCompilationUnit(Future)
             handleRecoverableError(AwaitNotAsync, await, await)
           endInvalidAwaitExpression(await, ), AwaitNotAsync)
           handleUnaryPrefixExpression(!)
-        endBinaryExpression(^)
-        handleExpressionStatement(;)
+        endBinaryExpression(^, ))
+        handleExpressionStatement(!, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -481,10 +481,10 @@ beginCompilationUnit(Future)
               handleRecoverableError(AwaitNotAsync, await, await)
             endInvalidAwaitExpression(await, ), AwaitNotAsync)
             handleUnaryPrefixExpression(!)
-          endBinaryExpression(^)
+          endBinaryExpression(^, ))
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         beginMetadataStar(var)
         endMetadataStar(0)
         handleNoType(var)
@@ -554,7 +554,7 @@ beginCompilationUnit(Future)
           endInvalidAwaitExpression(await, f, AwaitNotAsync)
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         handleIdentifier(xor, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -581,7 +581,7 @@ beginCompilationUnit(Future)
           endInvalidAwaitExpression(await, f, AwaitNotAsync)
         endArguments(3, (, ))
         handleSend(xor, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(xor, ;)
         beginAwaitExpression(await)
           handleIdentifier(f, expression)
           handleNoTypeArguments(^)
@@ -597,8 +597,8 @@ beginCompilationUnit(Future)
             handleSend(f, ;)
             handleRecoverableError(AwaitNotAsync, await, await)
           endInvalidAwaitExpression(await, f, AwaitNotAsync)
-        endBinaryExpression(^)
-        handleExpressionStatement(;)
+        endBinaryExpression(^, f)
+        handleExpressionStatement(await, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -617,10 +617,10 @@ beginCompilationUnit(Future)
               handleSend(f, ))
               handleRecoverableError(AwaitNotAsync, await, await)
             endInvalidAwaitExpression(await, f, AwaitNotAsync)
-          endBinaryExpression(^)
+          endBinaryExpression(^, f)
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         beginAwaitExpression(await)
           handleIdentifier(f, expression)
           handleNoTypeArguments(+)
@@ -636,8 +636,8 @@ beginCompilationUnit(Future)
             handleSend(f, ;)
             handleRecoverableError(AwaitNotAsync, await, await)
           endInvalidAwaitExpression(await, f, AwaitNotAsync)
-        endBinaryExpression(+)
-        handleExpressionStatement(;)
+        endBinaryExpression(+, f)
+        handleExpressionStatement(await, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -656,10 +656,10 @@ beginCompilationUnit(Future)
               handleSend(f, ))
               handleRecoverableError(AwaitNotAsync, await, await)
             endInvalidAwaitExpression(await, f, AwaitNotAsync)
-          endBinaryExpression(+)
+          endBinaryExpression(+, f)
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         beginAwaitExpression(await)
           handleIdentifier(f, expression)
           handleNoTypeArguments(-)
@@ -675,8 +675,8 @@ beginCompilationUnit(Future)
             handleSend(f, ;)
             handleRecoverableError(AwaitNotAsync, await, await)
           endInvalidAwaitExpression(await, f, AwaitNotAsync)
-        endBinaryExpression(-)
-        handleExpressionStatement(;)
+        endBinaryExpression(-, f)
+        handleExpressionStatement(await, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -695,10 +695,10 @@ beginCompilationUnit(Future)
               handleSend(f, ))
               handleRecoverableError(AwaitNotAsync, await, await)
             endInvalidAwaitExpression(await, f, AwaitNotAsync)
-          endBinaryExpression(-)
+          endBinaryExpression(-, f)
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         beginAwaitExpression(await)
           handleIdentifier(f, expression)
           handleNoTypeArguments(^)
@@ -716,8 +716,8 @@ beginCompilationUnit(Future)
             handleRecoverableError(AwaitNotAsync, await, await)
           endInvalidAwaitExpression(await, f, AwaitNotAsync)
           handleUnaryPrefixExpression(!)
-        endBinaryExpression(^)
-        handleExpressionStatement(;)
+        endBinaryExpression(^, f)
+        handleExpressionStatement(!, ;)
         handleIdentifier(print, expression)
         handleNoTypeArguments(()
         beginArguments(()
@@ -738,10 +738,10 @@ beginCompilationUnit(Future)
               handleRecoverableError(AwaitNotAsync, await, await)
             endInvalidAwaitExpression(await, f, AwaitNotAsync)
             handleUnaryPrefixExpression(!)
-          endBinaryExpression(^)
+          endBinaryExpression(^, f)
         endArguments(1, (, ))
         handleSend(print, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(print, ;)
         beginMetadataStar(await)
         endMetadataStar(0)
         handleIdentifier(await, typeReference)
@@ -949,13 +949,13 @@ beginCompilationUnit(Future)
             handleNoTypeArguments(^)
             handleNoArguments(^)
             handleSend(b, ^)
-          endBinaryExpression(^)
+          endBinaryExpression(^, b)
           beginBinaryExpression(^)
             handleIdentifier(c, expression)
             handleNoTypeArguments(;)
             handleNoArguments(;)
             handleSend(c, ;)
-          endBinaryExpression(^)
+          endBinaryExpression(^, c)
         endReturnStatement(true, return, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(bool, null, })

pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.intertwined.expect

@@ -125,7 +125,7 @@ parseUnit(Future)
                           listener: handleRecoverableError(AwaitNotAsync, await, await)
                         listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
                 ensureSemicolon())
-                listener: handleExpressionStatement(;)
+                listener: handleExpressionStatement(await, ;)
           notEofOrValue(}, if)
           parseStatement(;)
             parseStatementX(;)
@@ -276,7 +276,7 @@ parseUnit(Future)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, xor)
           parseStatement(;)
             parseStatementX(;)
@@ -385,7 +385,7 @@ parseUnit(Future)
                                     listener: endArguments(3, (, ))
                               listener: handleSend(xor, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(xor, ;)
           notEofOrValue(}, await)
           parseStatement(;)
             parseStatementX(;)
@@ -449,9 +449,9 @@ parseUnit(Future)
                           reportRecoverableError(await, AwaitNotAsync)
                             listener: handleRecoverableError(AwaitNotAsync, await, await)
                           listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
-                    listener: endBinaryExpression(^)
+                    listener: endBinaryExpression(^, ))
                 ensureSemicolon())
-                listener: handleExpressionStatement(;)
+                listener: handleExpressionStatement(await, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -529,11 +529,11 @@ parseUnit(Future)
                                               reportRecoverableError(await, AwaitNotAsync)
                                                 listener: handleRecoverableError(AwaitNotAsync, await, await)
                                               listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
-                                        listener: endBinaryExpression(^)
+                                        listener: endBinaryExpression(^, ))
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, await)
           parseStatement(;)
             parseStatementX(;)
@@ -597,9 +597,9 @@ parseUnit(Future)
                           reportRecoverableError(await, AwaitNotAsync)
                             listener: handleRecoverableError(AwaitNotAsync, await, await)
                           listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
-                    listener: endBinaryExpression(+)
+                    listener: endBinaryExpression(+, ))
                 ensureSemicolon())
-                listener: handleExpressionStatement(;)
+                listener: handleExpressionStatement(await, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -677,11 +677,11 @@ parseUnit(Future)
                                               reportRecoverableError(await, AwaitNotAsync)
                                                 listener: handleRecoverableError(AwaitNotAsync, await, await)
                                               listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
-                                        listener: endBinaryExpression(+)
+                                        listener: endBinaryExpression(+, ))
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, await)
           parseStatement(;)
             parseStatementX(;)
@@ -745,9 +745,9 @@ parseUnit(Future)
                           reportRecoverableError(await, AwaitNotAsync)
                             listener: handleRecoverableError(AwaitNotAsync, await, await)
                           listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
-                    listener: endBinaryExpression(-)
+                    listener: endBinaryExpression(-, ))
                 ensureSemicolon())
-                listener: handleExpressionStatement(;)
+                listener: handleExpressionStatement(await, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -825,11 +825,11 @@ parseUnit(Future)
                                               reportRecoverableError(await, AwaitNotAsync)
                                                 listener: handleRecoverableError(AwaitNotAsync, await, await)
                                               listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
-                                        listener: endBinaryExpression(-)
+                                        listener: endBinaryExpression(-, ))
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, !)
           parseStatement(;)
             parseStatementX(;)
@@ -899,9 +899,9 @@ parseUnit(Future)
                                     listener: handleRecoverableError(AwaitNotAsync, await, await)
                                   listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
                             listener: handleUnaryPrefixExpression(!)
-                        listener: endBinaryExpression(^)
+                        listener: endBinaryExpression(^, ))
                     ensureSemicolon())
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(!, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -985,11 +985,11 @@ parseUnit(Future)
                                                     listener: handleRecoverableError(AwaitNotAsync, await, await)
                                                   listener: endInvalidAwaitExpression(await, ), AwaitNotAsync)
                                             listener: handleUnaryPrefixExpression(!)
-                                        listener: endBinaryExpression(^)
+                                        listener: endBinaryExpression(^, ))
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, var)
           parseStatement(;)
             parseStatementX(;)
@@ -1190,7 +1190,7 @@ parseUnit(Future)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, xor)
           parseStatement(;)
             parseStatementX(;)
@@ -1287,7 +1287,7 @@ parseUnit(Future)
                                     listener: endArguments(3, (, ))
                               listener: handleSend(xor, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(xor, ;)
           notEofOrValue(}, await)
           parseStatement(;)
             parseStatementX(;)
@@ -1343,9 +1343,9 @@ parseUnit(Future)
                           reportRecoverableError(await, AwaitNotAsync)
                             listener: handleRecoverableError(AwaitNotAsync, await, await)
                           listener: endInvalidAwaitExpression(await, f, AwaitNotAsync)
-                    listener: endBinaryExpression(^)
+                    listener: endBinaryExpression(^, f)
                 ensureSemicolon(f)
-                listener: handleExpressionStatement(;)
+                listener: handleExpressionStatement(await, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -1415,11 +1415,11 @@ parseUnit(Future)
                                               reportRecoverableError(await, AwaitNotAsync)
                                                 listener: handleRecoverableError(AwaitNotAsync, await, await)
                                               listener: endInvalidAwaitExpression(await, f, AwaitNotAsync)
-                                        listener: endBinaryExpression(^)
+                                        listener: endBinaryExpression(^, f)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, await)
           parseStatement(;)
             parseStatementX(;)
@@ -1475,9 +1475,9 @@ parseUnit(Future)
                           reportRecoverableError(await, AwaitNotAsync)
                             listener: handleRecoverableError(AwaitNotAsync, await, await)
                           listener: endInvalidAwaitExpression(await, f, AwaitNotAsync)
-                    listener: endBinaryExpression(+)
+                    listener: endBinaryExpression(+, f)
                 ensureSemicolon(f)
-                listener: handleExpressionStatement(;)
+                listener: handleExpressionStatement(await, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -1547,11 +1547,11 @@ parseUnit(Future)
                                               reportRecoverableError(await, AwaitNotAsync)
                                                 listener: handleRecoverableError(AwaitNotAsync, await, await)
                                               listener: endInvalidAwaitExpression(await, f, AwaitNotAsync)
-                                        listener: endBinaryExpression(+)
+                                        listener: endBinaryExpression(+, f)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, await)
           parseStatement(;)
             parseStatementX(;)
@@ -1607,9 +1607,9 @@ parseUnit(Future)
                           reportRecoverableError(await, AwaitNotAsync)
                             listener: handleRecoverableError(AwaitNotAsync, await, await)
                           listener: endInvalidAwaitExpression(await, f, AwaitNotAsync)
-                    listener: endBinaryExpression(-)
+                    listener: endBinaryExpression(-, f)
                 ensureSemicolon(f)
-                listener: handleExpressionStatement(;)
+                listener: handleExpressionStatement(await, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -1679,11 +1679,11 @@ parseUnit(Future)
                                               reportRecoverableError(await, AwaitNotAsync)
                                                 listener: handleRecoverableError(AwaitNotAsync, await, await)
                                               listener: endInvalidAwaitExpression(await, f, AwaitNotAsync)
-                                        listener: endBinaryExpression(-)
+                                        listener: endBinaryExpression(-, f)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, !)
           parseStatement(;)
             parseStatementX(;)
@@ -1745,9 +1745,9 @@ parseUnit(Future)
                                     listener: handleRecoverableError(AwaitNotAsync, await, await)
                                   listener: endInvalidAwaitExpression(await, f, AwaitNotAsync)
                             listener: handleUnaryPrefixExpression(!)
-                        listener: endBinaryExpression(^)
+                        listener: endBinaryExpression(^, f)
                     ensureSemicolon(f)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(!, ;)
           notEofOrValue(}, print)
           parseStatement(;)
             parseStatementX(;)
@@ -1823,11 +1823,11 @@ parseUnit(Future)
                                                     listener: handleRecoverableError(AwaitNotAsync, await, await)
                                                   listener: endInvalidAwaitExpression(await, f, AwaitNotAsync)
                                             listener: handleUnaryPrefixExpression(!)
-                                        listener: endBinaryExpression(^)
+                                        listener: endBinaryExpression(^, f)
                                     listener: endArguments(1, (, ))
                               listener: handleSend(print, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(print, ;)
           notEofOrValue(}, await)
           parseStatement(;)
             parseStatementX(;)
@@ -2265,7 +2265,7 @@ parseUnit(Future)
                               parseArgumentsOpt(b)
                                 listener: handleNoArguments(^)
                               listener: handleSend(b, ^)
-                    listener: endBinaryExpression(^)
+                    listener: endBinaryExpression(^, b)
                     listener: beginBinaryExpression(^)
                     parsePrecedenceExpression(^, 11, true, ConstantPatternContext.none)
                       parseUnaryExpression(^, true, ConstantPatternContext.none)
@@ -2279,7 +2279,7 @@ parseUnit(Future)
                               parseArgumentsOpt(c)
                                 listener: handleNoArguments(;)
                               listener: handleSend(c, ;)
-                    listener: endBinaryExpression(^)
+                    listener: endBinaryExpression(^, c)
                 ensureSemicolon(c)
                 listener: endReturnStatement(true, return, ;)
                 inGenerator()

pkg/front_end/parser_testcases/error_recovery/issue_51759.crash_dart.expect

@@ -63,7 +63,7 @@ beginCompilationUnit(void)
           handleEmptyFunctionBody(;)
         endFunctionExpression((, ;)
         handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ;, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(<, ;)
       endBlockFunctionBody(2, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_51759.crash_dart.intertwined.expect

@@ -104,7 +104,7 @@ parseUnit(void)
                       reportRecoverableError(;, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                         listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ;, ;)
                       rewriter()
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(<, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(2, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/issue_51759_as_reported.crash_dart.expect

@@ -63,7 +63,7 @@ beginCompilationUnit(void)
           handleEmptyFunctionBody(;)
         endFunctionExpression((, ;)
         handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ;, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(<, ;)
       endBlockFunctionBody(2, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_51759_as_reported.crash_dart.intertwined.expect

@@ -109,7 +109,7 @@ parseUnit(void)
                       reportRecoverableError(;, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                         listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ;, ;)
                       rewriter()
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(<, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(2, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/issue_51759_prime.crash_dart.expect

@@ -63,7 +63,7 @@ beginCompilationUnit(void)
           handleEmptyFunctionBody(;)
         endFunctionExpression((, ;)
         handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ;, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(<, ;)
       endBlockFunctionBody(2, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/issue_51759_prime.crash_dart.intertwined.expect

@@ -102,7 +102,7 @@ parseUnit(void)
                       reportRecoverableError(;, Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}])
                         listener: handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], ;, ;)
                       rewriter()
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(<, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(2, {, })
         listener: endTopLevelMethod(void, null, })

pkg/front_end/parser_testcases/error_recovery/symbols.dart.expect

@@ -403,7 +403,7 @@ beginCompilationUnit(main)
         beginLiteralSymbol(#)
           handleSymbolVoid(void)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleSymbolVoid(void)
         endLiteralSymbol(#, 1)
@@ -411,558 +411,558 @@ beginCompilationUnit(main)
         handleNoTypeArguments(;)
         handleNoArguments(;)
         handleSend(foo, ;)
-        handleEndingBinaryExpression(.)
-        handleExpressionStatement(;)
+        handleEndingBinaryExpression(., foo)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'void' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: void}], void, void)
           handleIdentifier(void, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'assert' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: assert}], assert, assert)
           handleIdentifier(assert, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'break' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: break}], break, break)
           handleIdentifier(break, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'case' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: case}], case, case)
           handleIdentifier(case, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'catch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: catch}], catch, catch)
           handleIdentifier(catch, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'class' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: class}], class, class)
           handleIdentifier(class, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'const' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: const}], const, const)
           handleIdentifier(const, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'continue' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: continue}], continue, continue)
           handleIdentifier(continue, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'default' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: default}], default, default)
           handleIdentifier(default, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'do' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: do}], do, do)
           handleIdentifier(do, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'else' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: else}], else, else)
           handleIdentifier(else, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: enum}], enum, enum)
           handleIdentifier(enum, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'extends' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: extends}], extends, extends)
           handleIdentifier(extends, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'false' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: false}], false, false)
           handleIdentifier(false, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'final' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: final}], final, final)
           handleIdentifier(final, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'finally' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: finally}], finally, finally)
           handleIdentifier(finally, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'for' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: for}], for, for)
           handleIdentifier(for, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'if' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: if}], if, if)
           handleIdentifier(if, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'in' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: in}], in, in)
           handleIdentifier(in, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'is' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: is}], is, is)
           handleIdentifier(is, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'new' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: new}], new, new)
           handleIdentifier(new, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'null' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: null}], null, null)
           handleIdentifier(null, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'rethrow' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: rethrow}], rethrow, rethrow)
           handleIdentifier(rethrow, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'return' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: return}], return, return)
           handleIdentifier(return, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'super' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: super}], super, super)
           handleIdentifier(super, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'switch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: switch}], switch, switch)
           handleIdentifier(switch, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this)
           handleIdentifier(this, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'throw' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: throw}], throw, throw)
           handleIdentifier(throw, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'true' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: true}], true, true)
           handleIdentifier(true, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'try' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: try}], try, try)
           handleIdentifier(try, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'var' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: var}], var, var)
           handleIdentifier(var, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'while' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: while}], while, while)
           handleIdentifier(while, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with)
           handleIdentifier(with, literalSymbol)
         endLiteralSymbol(#, 1)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'assert' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: assert}], assert, assert)
           handleIdentifier(assert, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'break' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: break}], break, break)
           handleIdentifier(break, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'case' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: case}], case, case)
           handleIdentifier(case, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'catch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: catch}], catch, catch)
           handleIdentifier(catch, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'class' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: class}], class, class)
           handleIdentifier(class, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'const' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: const}], const, const)
           handleIdentifier(const, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'continue' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: continue}], continue, continue)
           handleIdentifier(continue, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'default' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: default}], default, default)
           handleIdentifier(default, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'do' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: do}], do, do)
           handleIdentifier(do, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'else' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: else}], else, else)
           handleIdentifier(else, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: enum}], enum, enum)
           handleIdentifier(enum, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'extends' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: extends}], extends, extends)
           handleIdentifier(extends, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'false' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: false}], false, false)
           handleIdentifier(false, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'final' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: final}], final, final)
           handleIdentifier(final, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'finally' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: finally}], finally, finally)
           handleIdentifier(finally, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'for' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: for}], for, for)
           handleIdentifier(for, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'if' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: if}], if, if)
           handleIdentifier(if, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'in' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: in}], in, in)
           handleIdentifier(in, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'is' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: is}], is, is)
           handleIdentifier(is, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'new' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: new}], new, new)
           handleIdentifier(new, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'null' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: null}], null, null)
           handleIdentifier(null, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'rethrow' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: rethrow}], rethrow, rethrow)
           handleIdentifier(rethrow, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'return' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: return}], return, return)
           handleIdentifier(return, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'super' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: super}], super, super)
           handleIdentifier(super, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'switch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: switch}], switch, switch)
           handleIdentifier(switch, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this)
           handleIdentifier(this, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'throw' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: throw}], throw, throw)
           handleIdentifier(throw, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'true' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: true}], true, true)
           handleIdentifier(true, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'try' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: try}], try, try)
           handleIdentifier(try, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'var' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: var}], var, var)
           handleIdentifier(var, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'while' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: while}], while, while)
           handleIdentifier(while, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleIdentifier(foo, literalSymbol)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with)
           handleIdentifier(with, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'assert' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: assert}], assert, assert)
           handleIdentifier(assert, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'break' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: break}], break, break)
           handleIdentifier(break, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'case' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: case}], case, case)
           handleIdentifier(case, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'catch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: catch}], catch, catch)
           handleIdentifier(catch, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'class' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: class}], class, class)
           handleIdentifier(class, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'const' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: const}], const, const)
           handleIdentifier(const, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'continue' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: continue}], continue, continue)
           handleIdentifier(continue, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'default' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: default}], default, default)
           handleIdentifier(default, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'do' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: do}], do, do)
           handleIdentifier(do, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'else' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: else}], else, else)
           handleIdentifier(else, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: enum}], enum, enum)
           handleIdentifier(enum, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'extends' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: extends}], extends, extends)
           handleIdentifier(extends, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'false' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: false}], false, false)
           handleIdentifier(false, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'final' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: final}], final, final)
           handleIdentifier(final, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'finally' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: finally}], finally, finally)
           handleIdentifier(finally, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'for' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: for}], for, for)
           handleIdentifier(for, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'if' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: if}], if, if)
           handleIdentifier(if, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'in' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: in}], in, in)
           handleIdentifier(in, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'is' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: is}], is, is)
           handleIdentifier(is, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'new' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: new}], new, new)
           handleIdentifier(new, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'null' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: null}], null, null)
           handleIdentifier(null, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'rethrow' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: rethrow}], rethrow, rethrow)
           handleIdentifier(rethrow, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'return' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: return}], return, return)
           handleIdentifier(return, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'super' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: super}], super, super)
           handleIdentifier(super, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'switch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: switch}], switch, switch)
           handleIdentifier(switch, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this)
           handleIdentifier(this, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'throw' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: throw}], throw, throw)
           handleIdentifier(throw, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'true' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: true}], true, true)
           handleIdentifier(true, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'try' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: try}], try, try)
           handleIdentifier(try, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'var' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: var}], var, var)
           handleIdentifier(var, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'while' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: while}], while, while)
           handleIdentifier(while, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
         beginLiteralSymbol(#)
           handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with)
           handleIdentifier(with, literalSymbol)
           handleIdentifier(foo, literalSymbolContinuation)
         endLiteralSymbol(#, 2)
-        handleExpressionStatement(;)
+        handleExpressionStatement(#, ;)
       endBlockFunctionBody(99, {, })
     endTopLevelMethod(main, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/error_recovery/symbols.dart.intertwined.expect

@@ -42,7 +42,7 @@ parseUnit(main)
                               listener: handleSymbolVoid(void)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(void)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -68,9 +68,9 @@ parseUnit(main)
                               parseArgumentsOpt(foo)
                                 listener: handleNoArguments(;)
                               listener: handleSend(foo, ;)
-                        listener: handleEndingBinaryExpression(.)
+                        listener: handleEndingBinaryExpression(., foo)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -92,7 +92,7 @@ parseUnit(main)
                                 listener: handleIdentifier(void, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(void)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -112,7 +112,7 @@ parseUnit(main)
                                 listener: handleIdentifier(assert, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(assert)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -132,7 +132,7 @@ parseUnit(main)
                                 listener: handleIdentifier(break, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(break)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -152,7 +152,7 @@ parseUnit(main)
                                 listener: handleIdentifier(case, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(case)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -172,7 +172,7 @@ parseUnit(main)
                                 listener: handleIdentifier(catch, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(catch)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -192,7 +192,7 @@ parseUnit(main)
                                 listener: handleIdentifier(class, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(class)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -212,7 +212,7 @@ parseUnit(main)
                                 listener: handleIdentifier(const, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(const)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -232,7 +232,7 @@ parseUnit(main)
                                 listener: handleIdentifier(continue, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(continue)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -252,7 +252,7 @@ parseUnit(main)
                                 listener: handleIdentifier(default, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(default)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -272,7 +272,7 @@ parseUnit(main)
                                 listener: handleIdentifier(do, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(do)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -292,7 +292,7 @@ parseUnit(main)
                                 listener: handleIdentifier(else, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(else)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -312,7 +312,7 @@ parseUnit(main)
                                 listener: handleIdentifier(enum, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(enum)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -332,7 +332,7 @@ parseUnit(main)
                                 listener: handleIdentifier(extends, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(extends)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -352,7 +352,7 @@ parseUnit(main)
                                 listener: handleIdentifier(false, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(false)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -372,7 +372,7 @@ parseUnit(main)
                                 listener: handleIdentifier(final, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(final)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -392,7 +392,7 @@ parseUnit(main)
                                 listener: handleIdentifier(finally, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(finally)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -412,7 +412,7 @@ parseUnit(main)
                                 listener: handleIdentifier(for, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(for)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -432,7 +432,7 @@ parseUnit(main)
                                 listener: handleIdentifier(if, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(if)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -452,7 +452,7 @@ parseUnit(main)
                                 listener: handleIdentifier(in, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(in)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -472,7 +472,7 @@ parseUnit(main)
                                 listener: handleIdentifier(is, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(is)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -492,7 +492,7 @@ parseUnit(main)
                                 listener: handleIdentifier(new, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(new)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -512,7 +512,7 @@ parseUnit(main)
                                 listener: handleIdentifier(null, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(null)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -532,7 +532,7 @@ parseUnit(main)
                                 listener: handleIdentifier(rethrow, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(rethrow)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -552,7 +552,7 @@ parseUnit(main)
                                 listener: handleIdentifier(return, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(return)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -572,7 +572,7 @@ parseUnit(main)
                                 listener: handleIdentifier(super, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(super)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -592,7 +592,7 @@ parseUnit(main)
                                 listener: handleIdentifier(switch, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(switch)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -612,7 +612,7 @@ parseUnit(main)
                                 listener: handleIdentifier(this, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(this)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -632,7 +632,7 @@ parseUnit(main)
                                 listener: handleIdentifier(throw, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(throw)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -652,7 +652,7 @@ parseUnit(main)
                                 listener: handleIdentifier(true, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(true)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -672,7 +672,7 @@ parseUnit(main)
                                 listener: handleIdentifier(try, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(try)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -692,7 +692,7 @@ parseUnit(main)
                                 listener: handleIdentifier(var, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(var)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -712,7 +712,7 @@ parseUnit(main)
                                 listener: handleIdentifier(while, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(while)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -732,7 +732,7 @@ parseUnit(main)
                                 listener: handleIdentifier(with, literalSymbol)
                               listener: endLiteralSymbol(#, 1)
                     ensureSemicolon(with)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -754,7 +754,7 @@ parseUnit(main)
                                 listener: handleIdentifier(assert, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(assert)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -776,7 +776,7 @@ parseUnit(main)
                                 listener: handleIdentifier(break, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(break)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -798,7 +798,7 @@ parseUnit(main)
                                 listener: handleIdentifier(case, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(case)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -820,7 +820,7 @@ parseUnit(main)
                                 listener: handleIdentifier(catch, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(catch)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -842,7 +842,7 @@ parseUnit(main)
                                 listener: handleIdentifier(class, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(class)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -864,7 +864,7 @@ parseUnit(main)
                                 listener: handleIdentifier(const, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(const)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -886,7 +886,7 @@ parseUnit(main)
                                 listener: handleIdentifier(continue, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(continue)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -908,7 +908,7 @@ parseUnit(main)
                                 listener: handleIdentifier(default, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(default)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -930,7 +930,7 @@ parseUnit(main)
                                 listener: handleIdentifier(do, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(do)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -952,7 +952,7 @@ parseUnit(main)
                                 listener: handleIdentifier(else, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(else)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -974,7 +974,7 @@ parseUnit(main)
                                 listener: handleIdentifier(enum, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(enum)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -996,7 +996,7 @@ parseUnit(main)
                                 listener: handleIdentifier(extends, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(extends)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1018,7 +1018,7 @@ parseUnit(main)
                                 listener: handleIdentifier(false, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(false)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1040,7 +1040,7 @@ parseUnit(main)
                                 listener: handleIdentifier(final, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(final)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1062,7 +1062,7 @@ parseUnit(main)
                                 listener: handleIdentifier(finally, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(finally)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1084,7 +1084,7 @@ parseUnit(main)
                                 listener: handleIdentifier(for, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(for)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1106,7 +1106,7 @@ parseUnit(main)
                                 listener: handleIdentifier(if, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(if)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1128,7 +1128,7 @@ parseUnit(main)
                                 listener: handleIdentifier(in, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(in)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1150,7 +1150,7 @@ parseUnit(main)
                                 listener: handleIdentifier(is, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(is)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1172,7 +1172,7 @@ parseUnit(main)
                                 listener: handleIdentifier(new, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(new)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1194,7 +1194,7 @@ parseUnit(main)
                                 listener: handleIdentifier(null, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(null)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1216,7 +1216,7 @@ parseUnit(main)
                                 listener: handleIdentifier(rethrow, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(rethrow)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1238,7 +1238,7 @@ parseUnit(main)
                                 listener: handleIdentifier(return, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(return)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1260,7 +1260,7 @@ parseUnit(main)
                                 listener: handleIdentifier(super, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(super)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1282,7 +1282,7 @@ parseUnit(main)
                                 listener: handleIdentifier(switch, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(switch)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1304,7 +1304,7 @@ parseUnit(main)
                                 listener: handleIdentifier(this, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(this)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1326,7 +1326,7 @@ parseUnit(main)
                                 listener: handleIdentifier(throw, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(throw)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1348,7 +1348,7 @@ parseUnit(main)
                                 listener: handleIdentifier(true, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(true)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1370,7 +1370,7 @@ parseUnit(main)
                                 listener: handleIdentifier(try, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(try)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1392,7 +1392,7 @@ parseUnit(main)
                                 listener: handleIdentifier(var, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(var)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1414,7 +1414,7 @@ parseUnit(main)
                                 listener: handleIdentifier(while, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(while)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1436,7 +1436,7 @@ parseUnit(main)
                                 listener: handleIdentifier(with, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(with)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1458,7 +1458,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1480,7 +1480,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1502,7 +1502,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1524,7 +1524,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1546,7 +1546,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1568,7 +1568,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1590,7 +1590,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1612,7 +1612,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1634,7 +1634,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1656,7 +1656,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1678,7 +1678,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1700,7 +1700,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1722,7 +1722,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1744,7 +1744,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1766,7 +1766,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1788,7 +1788,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1810,7 +1810,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1832,7 +1832,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1854,7 +1854,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1876,7 +1876,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1898,7 +1898,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1920,7 +1920,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1942,7 +1942,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1964,7 +1964,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -1986,7 +1986,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -2008,7 +2008,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -2030,7 +2030,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -2052,7 +2052,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -2074,7 +2074,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -2096,7 +2096,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -2118,7 +2118,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, #)
           parseStatement(;)
             parseStatementX(;)
@@ -2140,7 +2140,7 @@ parseUnit(main)
                                 listener: handleIdentifier(foo, literalSymbolContinuation)
                               listener: endLiteralSymbol(#, 2)
                     ensureSemicolon(foo)
-                    listener: handleExpressionStatement(;)
+                    listener: handleExpressionStatement(#, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(99, {, })
         listener: endTopLevelMethod(main, null, })

pkg/front_end/parser_testcases/error_recovery/utf_16_le_content.crash_dart.intertwined.expect

@@ -2469,7 +2469,7 @@ parseUnit(EncodingErrorToken())
                                     listener: endArguments(12, (, ))
                               listener: handleSend(t, ;)
                   ensureSemicolon())
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(t, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(3, {, })
         listener: endTopLevelMethod(i, null, })

pkg/front_end/parser_testcases/error_recovery/yield_not_in_generator.dart.expect

@@ -31,7 +31,7 @@ beginCompilationUnit(Future)
         handleLiteralInt(7)
       endArguments(1, (, ))
       handleSend(value, ;)
-      handleEndingBinaryExpression(.)
+      handleEndingBinaryExpression(., ))
       handleExpressionFunctionBody(=>, ;)
     endTopLevelMethod(Future, null, ;)
   endTopLevelDeclaration(;)

pkg/front_end/parser_testcases/error_recovery/yield_not_in_generator.dart.intertwined.expect

@@ -64,7 +64,7 @@ parseUnit(Future)
                                       listener: handleLiteralInt(7)
                             listener: endArguments(1, (, ))
                       listener: handleSend(value, ;)
-                listener: handleEndingBinaryExpression(.)
+                listener: handleEndingBinaryExpression(., ))
             ensureSemicolon())
             listener: handleExpressionFunctionBody(=>, ;)
             inGenerator()

pkg/front_end/parser_testcases/extension_named_type.dart.expect

@@ -95,7 +95,7 @@ beginCompilationUnit(class)
       beginArguments(()
       endArguments(0, (, ))
       handleSend(method, ;)
-      handleEndingBinaryExpression(.)
+      handleEndingBinaryExpression(., ))
       handleExpressionFunctionBody(=>, ;)
     endTopLevelMethod(test, null, ;)
   endTopLevelDeclaration(;)

pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect

@@ -184,7 +184,7 @@ parseUnit(class)
                             listener: beginArguments(()
                             listener: endArguments(0, (, ))
                       listener: handleSend(method, ;)
-                listener: handleEndingBinaryExpression(.)
+                listener: handleEndingBinaryExpression(., ))
             ensureSemicolon())
             listener: handleExpressionFunctionBody(=>, ;)
             inGenerator()

pkg/front_end/parser_testcases/general/ambiguous_builder_01.dart.expect

@@ -117,7 +117,7 @@ beginCompilationUnit(x)
           handleSend(x, !=)
           beginBinaryExpression(!=)
             handleLiteralNull(null)
-          endBinaryExpression(!=)
+          endBinaryExpression(!=, null)
           handleParenthesizedCondition((, null, null)
           beginThenStatement({)
             beginBlock({, BlockKind(statement))

pkg/front_end/parser_testcases/general/ambiguous_builder_01.dart.intertwined.expect

@@ -191,7 +191,7 @@ parseUnit(x)
                             parsePrimary(!=, expression, ConstantPatternContext.none)
                               parseLiteralNull(!=)
                                 listener: handleLiteralNull(null)
-                        listener: endBinaryExpression(!=)
+                        listener: endBinaryExpression(!=, null)
                     ensureCloseParen(null, ()
                     listener: handleParenthesizedCondition((, null, null)
                 listener: beginThenStatement({)

pkg/front_end/parser_testcases/general/assignment.dart.expect

@@ -16,7 +16,7 @@ beginCompilationUnit(main)
         handleSend(foo, =)
         handleLiteralInt(42)
         handleAssignmentExpression(=)
-        handleExpressionStatement(;)
+        handleExpressionStatement(foo, ;)
       endBlockFunctionBody(1, {, })
     endTopLevelMethod(main, null, })
   endTopLevelDeclaration(})

pkg/front_end/parser_testcases/general/assignment.dart.intertwined.expect

@@ -52,7 +52,7 @@ parseUnit(main)
                               listener: handleLiteralInt(42)
                       listener: handleAssignmentExpression(=)
                   ensureSemicolon(42)
-                  listener: handleExpressionStatement(;)
+                  listener: handleExpressionStatement(foo, ;)
           notEofOrValue(}, })
           listener: endBlockFunctionBody(1, {, })
         listener: endTopLevelMethod(main, null, })

pkg/front_end/parser_testcases/general/augment_super.dart.expect

@@ -206,7 +206,7 @@ beginCompilationUnit(augment)
         endVariablesDeclaration(1, ;)
         beginParenthesizedExpressionOrRecordLiteral(()
         endRecordLiteral((, 0, null)
-        handleExpressionStatement(;)
+        handleExpressionStatement((, ;)
       endBlockFunctionBody(2, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})
@@ -248,12 +248,12 @@ beginCompilationUnit(augment)
         handleNoTypeArguments(;)
         handleNoArguments(;)
         handleSend(local, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(local, ;)
         handleIdentifier(augment, expression)
         handleNoTypeArguments(;)
         handleNoArguments(;)
         handleSend(augment, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(augment, ;)
       endBlockFunctionBody(3, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})
@@ -372,7 +372,7 @@ beginCompilationUnit(augment)
         handleLiteralInt(1)
         handleIndexedExpression(null, [, ])
         handleAssignmentExpression(=)
-        handleExpressionStatement(;)
+        handleExpressionStatement([, ;)
         beginMetadataStar(augment)
         endMetadataStar(0)
         handleIdentifier(augment, typeReference)
@@ -419,7 +419,7 @@ beginCompilationUnit(augment)
         endVariablesDeclaration(1, ;)
         beginParenthesizedExpressionOrRecordLiteral(()
         endRecordLiteral((, 0, null)
-        handleExpressionStatement(;)
+        handleExpressionStatement((, ;)
         beginMetadataStar(augment)
         endMetadataStar(0)
         handleIdentifier(augment, typeReference)
@@ -448,12 +448,12 @@ beginCompilationUnit(augment)
         handleNoTypeArguments(;)
         handleNoArguments(;)
         handleSend(local, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(local, ;)
         handleIdentifier(augment, expression)
         handleNoTypeArguments(;)
         handleNoArguments(;)
         handleSend(augment, ;)
-        handleExpressionStatement(;)
+        handleExpressionStatement(augment, ;)
       endBlockFunctionBody(6, {, })
     endTopLevelMethod(void, null, })
   endTopLevelDeclaration(})
@@ -518,7 +518,7 @@ beginCompilationUnit(augment)
               endVariablesDeclaration(1, ;)
               beginParenthesizedExpressionOrRecordLiteral(()
               endRecordLiteral((, 0, null)
-              handleExpressionStatement(;)
+              handleExpressionStatement((, ;)
             endBlockFunctionBody(2, {, })
           endClassMethod(null, void, (, null, })
         endMember()
@@ -561,12 +561,12 @@ beginCompilationUnit(augment)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(local, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(local, ;)
               handleIdentifier(augment, expression)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(augment, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(augment, ;)
             endBlockFunctionBody(3, {, })
           endClassMethod(null, void, (, null, })
         endMember()
@@ -612,16 +612,16 @@ beginCompilationUnit(augment)
               handleNoArguments(;)
               handleSend(, ;)
               handleUnaryPrefixAssignmentExpression(++)
-              handleExpressionStatement(;)
+              handleExpressionStatement(++, ;)
               handleIdentifier(augment, expression)
               handleNoTypeArguments(super)
               handleNoArguments(super)
               handleSend(augment, super)
               handleUnaryPrefixAssignmentExpression(--)
               handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], augment, augment)
-              handleExpressionStatement(;)
+              handleExpressionStatement(--, ;)
               handleSuperExpression(super, expression)
-              handleExpressionStatement(;)
+              handleExpressionStatement(super, ;)
               beginReturnStatement(return)
                 handleIdentifier(augment, expression)
                 handleNoTypeArguments(super)
@@ -631,7 +631,7 @@ beginCompilationUnit(augment)
                 handleRecoverableError(Message[ExpectedAfterButGot, Expected ';' after this., null, {string: ;}], augment, augment)
               endReturnStatement(true, return, ;)
               handleSuperExpression(super, expression)
-              handleExpressionStatement(;)
+              handleExpressionStatement(super, ;)
             endBlockFunctionBody(6, {, })
           endClassMethod(get, get, {, null, })
         endMember()
@@ -714,7 +714,7 @@ beginCompilationUnit(augment)
               endVariablesDeclaration(1, ;)
               beginParenthesizedExpressionOrRecordLiteral(()
               endRecordLiteral((, 0, null)
-              handleExpressionStatement(;)
+              handleExpressionStatement((, ;)
               beginMetadataStar(augment)
               endMetadataStar(0)
               handleIdentifier(augment, typeReference)
@@ -743,12 +743,12 @@ beginCompilationUnit(augment)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(local, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(local, ;)
               handleIdentifier(augment, expression)
               handleNoTypeArguments(;)
               handleNoArguments(;)
               handleSend(augment, ;)
-              handleExpressionStatement(;)
+              handleExpressionStatement(augment, ;)
             endBlockFunctionBody(6, {, })
           endClassMethod(null, void, (, null, })
         endMember()