Remove fasta parser listener.beginExpressionStatement
... and rename endExpressionStatement to handleExpressionStatement.
This is needed for the next step in NNBD.
Change-Id: Ibed51f15a4e2d93d2b16a50e4e22e912f22d2171
Reviewed-on: https://dart-review.googlesource.com/c/88301
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart
index f1d674a..6aea1f1 100644
--- a/pkg/analyzer/lib/src/fasta/ast_builder.dart
+++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart
@@ -340,7 +340,7 @@
void doPropertyGet() {}
- void endExpressionStatement(Token semicolon) {
+ void handleExpressionStatement(Token semicolon) {
assert(optional(';', semicolon));
debugEvent("ExpressionStatement");
Expression expression = pop();
diff --git a/pkg/analyzer/test/generated/parser_fasta_listener.dart b/pkg/analyzer/test/generated/parser_fasta_listener.dart
index d6646c3..0808c6b 100644
--- a/pkg/analyzer/test/generated/parser_fasta_listener.dart
+++ b/pkg/analyzer/test/generated/parser_fasta_listener.dart
@@ -201,12 +201,6 @@
}
@override
- void beginExpressionStatement(Token token) {
- super.beginExpressionStatement(token);
- begin('ExpressionStatement');
- }
-
- @override
void beginFactoryMethod(
Token lastConsumed, Token externalToken, Token constToken) {
super.beginFactoryMethod(lastConsumed, externalToken, constToken);
@@ -682,12 +676,6 @@
}
@override
- void endExpressionStatement(Token token) {
- end('ExpressionStatement');
- super.endExpressionStatement(token);
- }
-
- @override
void endFactoryMethod(
Token beginToken, Token factoryKeyword, Token endToken) {
end('FactoryMethod');
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
index bae6a26..31701d0 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -1143,7 +1143,7 @@
}
@override
- void endExpressionStatement(Token token) {
+ void handleExpressionStatement(Token token) {
debugEvent("ExpressionStatement");
push(forest.expressionStatement(popForEffect(), token));
}
diff --git a/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart b/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart
index c789a59..ef520f0 100644
--- a/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart
+++ b/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart
@@ -136,11 +136,6 @@
}
@override
- void beginExpressionStatement(Token token) {
- listener?.beginExpressionStatement(token);
- }
-
- @override
void beginFactoryMethod(
Token lastConsumed, Token externalToken, Token constToken) {
listener?.beginFactoryMethod(lastConsumed, externalToken, constToken);
@@ -546,8 +541,8 @@
}
@override
- void endExpressionStatement(Token token) {
- listener?.endExpressionStatement(token);
+ void handleExpressionStatement(Token token) {
+ listener?.handleExpressionStatement(token);
}
@override
diff --git a/pkg/front_end/lib/src/fasta/parser/listener.dart b/pkg/front_end/lib/src/fasta/parser/listener.dart
index aba67e3..d681804 100644
--- a/pkg/front_end/lib/src/fasta/parser/listener.dart
+++ b/pkg/front_end/lib/src/fasta/parser/listener.dart
@@ -251,8 +251,6 @@
logEvent("Export");
}
- void beginExpressionStatement(Token token) {}
-
/// Called by [Parser] after parsing an extraneous expression as error
/// recovery. For a stack-based listener, the suggested action is to discard
/// an expression from the stack.
@@ -260,7 +258,7 @@
logEvent("ExtraneousExpression");
}
- void endExpressionStatement(Token token) {
+ void handleExpressionStatement(Token token) {
logEvent("ExpressionStatement");
}
diff --git a/pkg/front_end/lib/src/fasta/parser/parser.dart b/pkg/front_end/lib/src/fasta/parser/parser.dart
index 448eecf..eb45e33 100644
--- a/pkg/front_end/lib/src/fasta/parser/parser.dart
+++ b/pkg/front_end/lib/src/fasta/parser/parser.dart
@@ -3672,10 +3672,9 @@
// 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.
- listener.beginExpressionStatement(token.next);
token = parseExpression(token);
token = ensureSemicolon(token);
- listener.endExpressionStatement(token);
+ listener.handleExpressionStatement(token);
return token;
}
diff --git a/pkg/front_end/lib/src/fasta/source/type_promotion_look_ahead_listener.dart b/pkg/front_end/lib/src/fasta/source/type_promotion_look_ahead_listener.dart
index 4a84c59..5ba2c51 100644
--- a/pkg/front_end/lib/src/fasta/source/type_promotion_look_ahead_listener.dart
+++ b/pkg/front_end/lib/src/fasta/source/type_promotion_look_ahead_listener.dart
@@ -478,7 +478,7 @@
}
@override
- void endExpressionStatement(Token token) {
+ void handleExpressionStatement(Token token) {
debugEvent("ExpressionStatement", token);
state.pop();
}
