Extract DiagnosticReporter implementation from Compiler.

pkg/compiler/lib/src/dart_backend/placeholder_collector.dart

 // Copyright (c) 2012, 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.
 
 part of dart_backend;
 
 class LocalPlaceholder {
   final String identifier;
   final Set<Node> nodes;
   LocalPlaceholder(this.identifier) : nodes = new Set<Node>();
@@ skipping 152 matching lines @@
   internalError(Spannable node, String reason) {
     collector.internalError(reason, node: node);
   }
 
   visitNode(Node node) {
     internalError(node, "Unhandled node");
   }
 }
 
 class PlaceholderCollector extends Visitor {
-  final DiagnosticListener listener;
+  final DiagnosticReporter reporter;
   final MirrorRenamer mirrorRenamer;
   final FunctionElement mainFunction;
   final Set<String> fixedMemberNames; // member names which cannot be renamed.
   final Map<Element, ElementAst> elementAsts;
   final Set<Node> prefixNodesToErase = new Set<Node>();
   final Set<Node> unresolvedNodes = new Set<Node>();
   final Map<Element, Set<Node>> elementNodes = new Map<Element, Set<Node>>();
   final Map<FunctionElement, FunctionScope> functionScopes
       = new Map<FunctionElement, FunctionScope>();
   final Map<LibraryElement, Set<Identifier>> privateNodes =
       new Map<LibraryElement, Set<Identifier>>();
   final List<DeclarationTypePlaceholder> declarationTypePlaceholders
       = new List<DeclarationTypePlaceholder>();
   final Map<String, Set<Identifier>> memberPlaceholders
       = new Map<String, Set<Identifier>>();
   final List<ConstructorPlaceholder> constructorPlaceholders
       = new List<ConstructorPlaceholder>();
   Map<String, LocalPlaceholder> currentLocalPlaceholders;
   Element currentElement;
   FunctionElement topmostEnclosingFunction;
   TreeElements treeElements;
 
   get currentFunctionScope => functionScopes.putIfAbsent(
       topmostEnclosingFunction, () => new FunctionScope());
 
-  PlaceholderCollector(this.listener, this.mirrorRenamer,
+  PlaceholderCollector(this.reporter, this.mirrorRenamer,
                        this.fixedMemberNames, this.elementAsts,
                        this.mainFunction);
 
   void collectFunctionDeclarationPlaceholders(
       FunctionElement element, FunctionExpression node) {
     if (element.isConstructor) {
       ConstructorElement constructor = element;
       tryMakeConstructorPlaceholder(node.name, element);
       RedirectingFactoryBody bodyAsRedirectingFactoryBody =
           node.body.asRedirectingFactoryBody();
@@ skipping 41 matching lines @@
       VariableDefinitions definitions = elementNode;
       Node definition = definitions.definitions.nodes.head;
       collectFieldDeclarationPlaceholders(element, definition);
       makeVarDeclarationTypePlaceholder(definitions);
     } else {
       assert(element is ClassElement || element is TypedefElement);
     }
     currentLocalPlaceholders = new Map<String, LocalPlaceholder>();
     if (!(element is ConstructorElement && element.isRedirectingFactory)) {
       // Do not visit the body of redirecting factories.
-      listener.withCurrentElement(element, () {
+      reporter.withCurrentElement(element, () {
         elementNode.accept(this);
       });
     }
   }
 
   // TODO(karlklose): should we create placeholders for these?
   bool isTypedefParameter(Element element) {
     return element != null &&
         element.enclosingElement != null &&
         element.enclosingElement.isTypedef;
@@ skipping 196 matching lines @@
 
     if (constructorName != null) {
       Element definingConstructor = findDefiningConstructor(element);
       constructorPlaceholders.add(new ConstructorPlaceholder(constructorName,
           definingConstructor));
       tryMakePrivateIdentifier(constructorName, element);
     }
   }
 
   void internalError(String reason, {Node node}) {
-    listener.internalError(node, reason);
+    reporter.internalError(node, reason);
   }
 
   visit(Node node) => (node == null) ? null : node.accept(this);
 
   visitNode(Node node) { node.visitChildren(this); }  // We must go deeper.
 
   visitNewExpression(NewExpression node) {
     Send send = node.send;
     DartType type = treeElements.getType(node);
     assert(type != null);
@@ skipping 225 matching lines @@
 
   visitBlock(Block node) {
     for (Node statement in node.statements.nodes) {
       if (statement is VariableDefinitions) {
         makeVarDeclarationTypePlaceholder(statement);
       }
     }
     node.visitChildren(this);
   }
 }