Split IrBuilder and IrBuilderVisitor.

pkg/analyzer2dart/lib/src/cps_generator.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer2dart.cps_generator;
 
 import 'package:analyzer/analyzer.dart';
 
 import 'package:compiler/implementation/elements/elements.dart' as dart2js;
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/element.dart' as analyzer;
 
+import 'package:compiler/implementation/dart2jslib.dart'
+    show DART_CONSTANT_SYSTEM;
 import 'package:compiler/implementation/cps_ir/cps_ir_nodes.dart' as ir;
 import 'package:compiler/implementation/cps_ir/cps_ir_builder.dart';
 import 'package:compiler/implementation/universe/universe.dart';
 
 import 'semantic_visitor.dart';
 import 'element_converter.dart';
 import 'util.dart';
 import 'package:analyzer2dart/src/identifier_semantics.dart';
 
-class CpsGeneratingVisitor extends SemanticVisitor<ir.Node> {
+class CpsGeneratingVisitor extends SemanticVisitor<ir.Node>
+    with IrBuilderMixin {
   final analyzer.Element element;
   final ElementConverter converter;
-  final IrBuilder irBuilder = new IrBuilder();
 
   CpsGeneratingVisitor(this.converter, this.element);
 
   Source get currentSource => element.source;
 
   @override
   ir.FunctionDefinition visitFunctionDeclaration(FunctionDeclaration node) {
     analyzer.FunctionElement function = node.element;
-    function.parameters.forEach((analyzer.ParameterElement parameter) {
-      // TODO(johnniwinther): Support "closure variables", that is variables
-      // accessed from an inner function.
-      irBuilder.createParameter(converter.convertElement(parameter),
-                                isClosureVariable: false);
+    dart2js.FunctionElement element = converter.convertElement(function);
+    return withBuilder(
+        new IrBuilder(DART_CONSTANT_SYSTEM,
+                      element,
+                      // TODO(johnniwinther): Supported closure variables.
+                      const <dart2js.Local>[]),
+        () {
+      function.parameters.forEach((analyzer.ParameterElement parameter) {
+        // TODO(johnniwinther): Support "closure variables", that is variables
+        // accessed from an inner function.
+        irBuilder.createParameter(converter.convertElement(parameter),
+                                  isClosureVariable: false);
+      });
+      // Visit the body directly to avoid processing the signature as
+      // expressions.
+      node.functionExpression.body.accept(this);
+      return irBuilder.buildFunctionDefinition(element, const []);
     });
-    // Visit the body directly to avoid processing the signature as expressions.
-    node.functionExpression.body.accept(this);
-    return irBuilder.buildFunctionDefinition(
-        converter.convertElement(function), const []);
   }
 
   @override
   visitStaticMethodInvocation(MethodInvocation node,
                               AccessSemantics semantics) {
     analyzer.Element staticElement = semantics.element;
     dart2js.Element element = converter.convertElement(staticElement);
     List<ir.Definition> arguments = <ir.Definition>[];
     for (Expression argument in node.argumentList.arguments) {
       ir.Definition value = argument.accept(this);
@@ skipping 91 matching lines @@
     analyzer.Element element = semantics.element;
     dart2js.Element target = converter.convertElement(element);
     // TODO(johnniwinther): Selector information should be computed in the
     // [TreeShaker] and shared with the [CpsGeneratingVisitor].
     assert(invariant(node, target.isTopLevel || target.isStatic,
         '$target expected to be top-level or static.'));
     return irBuilder.buildGetStatic(target,
         new Selector.getter(target.name, target.library));
   }
 }