Expose flow analysis operations so they can be reused by NNBD migration

stereotype441 · commit-bot@chromium.org · commit 0ce7cc53fea2 · 2019-08-07T15:15:00.000Z
Change-Id: Ifa101b91cfc93f19a492ecceb8bebbfeccd1a7db Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112164 Reviewed-by: Dan Rubel <danrubel@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Paul Berry <paulberry@google.com>
diff --git a/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart b/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart
@@ -12,6 +12,32 @@ import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/generated/variable_type_provider.dart';
 import 'package:front_end/src/fasta/flow_analysis/flow_analysis.dart';
 
+class AnalyzerFunctionBodyAccess
+    implements FunctionBodyAccess<VariableElement> {
+  final FunctionBody node;
+
+  AnalyzerFunctionBodyAccess(this.node);
+
+  @override
+  bool isPotentiallyMutatedInClosure(VariableElement variable) {
+    return node.isPotentiallyMutatedInClosure(variable);
+  }
+
+  @override
+  bool isPotentiallyMutatedInScope(VariableElement variable) {
+    return node.isPotentiallyMutatedInScope(variable);
+  }
+}
+
+class AnalyzerNodeOperations implements NodeOperations<Expression> {
+  const AnalyzerNodeOperations();
+
+  @override
+  Expression unwrapParenthesized(Expression node) {
+    return node.unParenthesized;
+  }
+}
+
 /// The helper for performing flow analysis during resolution.
 ///
 /// It contains related precomputed data, result, and non-trivial pieces of
@@ -43,7 +69,7 @@ class FlowAnalysisHelper {
     node.accept(_AssignedVariablesVisitor(assignedVariables));
 
     return FlowAnalysisHelper._(
-        _NodeOperations(),
+        const AnalyzerNodeOperations(),
         _TypeSystemTypeOperations(typeSystem),
         assignedVariables,
         retainDataForTesting ? FlowAnalysisResult() : null);
@@ -135,7 +161,7 @@ class FlowAnalysisHelper {
       flow = FlowAnalysis<Statement, Expression, VariableElement, DartType>(
         _nodeOperations,
         _typeOperations,
-        _FunctionBodyAccess(node),
+        AnalyzerFunctionBodyAccess(node),
       );
     }
 
@@ -429,22 +455,6 @@ class _AssignedVariablesVisitor extends RecursiveAstVisitor<void> {
   }
 }
 
-class _FunctionBodyAccess implements FunctionBodyAccess<VariableElement> {
-  final FunctionBody node;
-
-  _FunctionBodyAccess(this.node);
-
-  @override
-  bool isPotentiallyMutatedInClosure(VariableElement variable) {
-    return node.isPotentiallyMutatedInClosure(variable);
-  }
-
-  @override
-  bool isPotentiallyMutatedInScope(VariableElement variable) {
-    return node.isPotentiallyMutatedInScope(variable);
-  }
-}
-
 /// The flow analysis based implementation of [LocalVariableTypeProvider].
 class _LocalVariableTypeProvider implements LocalVariableTypeProvider {
   final FlowAnalysisHelper _manager;
@@ -459,13 +469,6 @@ class _LocalVariableTypeProvider implements LocalVariableTypeProvider {
   }
 }
 
-class _NodeOperations implements NodeOperations<Expression> {
-  @override
-  Expression unwrapParenthesized(Expression node) {
-    return node.unParenthesized;
-  }
-}
-
 class _TypeSystemTypeOperations
     implements TypeOperations<VariableElement, DartType> {
   final TypeSystem typeSystem;
