Add parameters to Forest method to support labeled statements
Change-Id: I6b45ba7155b10c7f6f12a203324f0cdc3ccb89f7
Reviewed-on: https://dart-review.googlesource.com/61761
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/fasta/resolution_storer.dart b/pkg/analyzer/lib/src/fasta/resolution_storer.dart
index 2a3b22c..65e968d 100644
--- a/pkg/analyzer/lib/src/fasta/resolution_storer.dart
+++ b/pkg/analyzer/lib/src/fasta/resolution_storer.dart
@@ -324,7 +324,8 @@
void invalidInitializer(InitializerJudgment judgment, Location location) {}
- void labeledStatement(StatementJudgment judgment, Location location) {}
+ void labeledStatement(StatementJudgment judgment, Location location,
+ Token label, Token colon, void statement) {}
void listLiteral(
ExpressionJudgment judgment,
diff --git a/pkg/front_end/lib/src/fasta/kernel/factory.dart b/pkg/front_end/lib/src/fasta/kernel/factory.dart
index e7e2e55..52255d7 100644
--- a/pkg/front_end/lib/src/fasta/kernel/factory.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/factory.dart
@@ -214,7 +214,8 @@
DartType testedType,
DartType inferredType);
- Statement labeledStatement(StatementJudgment judgment, int fileOffset);
+ Statement labeledStatement(StatementJudgment judgment, int fileOffset,
+ Token label, Token colon, Statement statement);
Expression listLiteral(
ExpressionJudgment judgment,
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_factory.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_factory.dart
index 295fd7a..f74b1f7 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_factory.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_factory.dart
@@ -316,7 +316,8 @@
}
@override
- Statement labeledStatement(StatementJudgment judgment, int fileOffset) {
+ Statement labeledStatement(StatementJudgment judgment, int fileOffset,
+ Token label, Token colon, Statement statement) {
return judgment;
}
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
index c0a4bfcab..88a0d42 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
@@ -1644,7 +1644,7 @@
ShadowTypeInferrer inferrer,
Factory<Expression, Statement, Initializer, Type> factory) {
inferrer.inferStatement(factory, judgment);
- inferrer.listener.labeledStatement(this, fileOffset);
+ inferrer.listener.labeledStatement(this, fileOffset, null, null, null);
}
}
diff --git a/pkg/front_end/lib/src/fasta/kernel/toplevel_inference_factory.dart b/pkg/front_end/lib/src/fasta/kernel/toplevel_inference_factory.dart
index 34c6761..55bc689 100644
--- a/pkg/front_end/lib/src/fasta/kernel/toplevel_inference_factory.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/toplevel_inference_factory.dart
@@ -245,7 +245,8 @@
DartType inferredType) {}
@override
- void labeledStatement(StatementJudgment judgment, int fileOffset) {}
+ void labeledStatement(StatementJudgment judgment, int fileOffset, Token label,
+ Token colon, void statement) {}
@override
void listLiteral(
diff --git a/pkg/front_end/lib/src/fasta/type_inference/type_inference_listener.dart b/pkg/front_end/lib/src/fasta/type_inference/type_inference_listener.dart
index f94d6d6..250746e 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/type_inference_listener.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/type_inference_listener.dart
@@ -218,7 +218,8 @@
DartType type,
DartType inferredType);
- void labeledStatement(StatementJudgment judgment, Location location);
+ void labeledStatement(StatementJudgment judgment, Location location,
+ Token label, Token colon, void statement);
void listLiteral(
ExpressionJudgment judgment,
@@ -646,7 +647,8 @@
DartType inferredType) {}
@override
- void labeledStatement(StatementJudgment judgment, location) {}
+ void labeledStatement(StatementJudgment judgment, location, Token label,
+ Token colon, void statement) {}
@override
void listLiteral(
