commit 8e8fb38c48a57331b7377920b9989bb2bd1adec5
author Konstantin Shcheglov <scheglov@google.com> Tue Jun 19 19:32:50 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Tue Jun 19 19:32:50 2018 +0000
tree eb19e67ffc4ee713ff09ee3a431c6e2e00e96fae
parent b71fb2e0869df277a8dbbaa771264b1e2f10f3b2

Convert ShadowBlock to BlockJudgment.

R=brianwilkerson@google.com, paulberry@google.com

Change-Id: Iaa5a65d8855cb5ef37ab4097be19c8d79fb3972a
Reviewed-on: https://dart-review.googlesource.com/60825
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

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

diff --git a/pkg/front_end/lib/src/fasta/kernel/fangorn.dart b/pkg/front_end/lib/src/fasta/kernel/fangorn.dart
index 56c1354..5cd8e53 100644
--- a/pkg/front_end/lib/src/fasta/kernel/fangorn.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/fangorn.dart
@@ -71,7 +71,7 @@
         AssertInitializerJudgment,
         AssertStatementJudgment,
         AwaitJudgment,
-        ShadowBlock,
+        BlockJudgment,
         BoolJudgment,
         BreakJudgment,
         ContinueJudgment,
@@ -334,7 +334,7 @@
         copy.add(statement);
       }
     }
-    return new ShadowBlock(copy ?? statements)
+    return new BlockJudgment(copy ?? statements)
       ..fileOffset = offsetForToken(openBrace);
   }
 
@@ -513,10 +513,10 @@
   @override
   Statement wrapVariables(Statement statement) {
     if (statement is _VariablesDeclaration) {
-      return new ShadowBlock(statement.declarations)
+      return new BlockJudgment(statement.declarations)
         ..fileOffset = statement.fileOffset;
     } else if (statement is VariableDeclaration) {
-      return new ShadowBlock(<Statement>[statement])
+      return new BlockJudgment(<Statement>[statement])
         ..fileOffset = statement.fileOffset;
     } else {
       return statement;

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

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 109dcf8..07639f7 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
@@ -243,15 +243,17 @@
 }
 
 /// Concrete shadow object representing a statement block in kernel form.
-class ShadowBlock extends Block implements StatementJudgment {
-  ShadowBlock(List<Statement> statements) : super(statements);
+class BlockJudgment extends Block implements StatementJudgment {
+  BlockJudgment(List<Statement> statements) : super(statements);
+
+  List<Statement> get judgments => statements;
 
   @override
   void infer<Expression, Statement, Initializer, Type>(
       ShadowTypeInferrer inferrer,
       Factory<Expression, Statement, Initializer, Type> factory) {
-    for (var statement in statements) {
-      inferrer.inferStatement(factory, statement);
+    for (var judgment in judgments) {
+      inferrer.inferStatement(factory, judgment);
     }
   }
 }