Extract DiagnosticReporter implementation from Compiler.

pkg/compiler/lib/src/dart_backend/outputter.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.
 
 part of dart_backend;
 
 typedef bool IsSafeToRemoveTypeDeclarations(
     Map<ClassElement, Iterable<Element>> classMembers);
 typedef void ElementCallback<E>(E element);
 typedef void ElementPostProcessFunction(
     AstElement element, ElementAst elementAst,
     ElementCallback<TypedefElement> typedefCallback,
     ElementCallback<ClassElement> classCallback);
 typedef ElementAst ComputeElementAstFunction(AstElement element);
 typedef bool ElementFilter(Element element);
 typedef List<Element> ElementSorter(Iterable<Element> elements);
 
 /// Output engine for dart2dart that is shared between the dart2js and the
 /// analyzer implementations of dart2dart.
 class DartOutputter {
-  final DiagnosticListener listener;
+  final DiagnosticReporter listener;

[sigurdm, 2015/10/05 13:45:34]

Rename variable? (several occurences in this file)

[Johnni Winther, 2015/10/06 08:04:32]

Done.

   final CompilerOutputProvider outputProvider;
   final bool forceStripTypes;
 
   // TODO(antonm): make available from command-line options.
   final bool outputAst = false;
   final bool enableMinification;
 
   /// If `true`, libraries are generated into separate files.
   final bool multiFile;
 
@@ skipping 108 matching lines @@
           outputUri,
           outputProvider,
           mirrorRenamer,
           multiFile: multiFile,
           forceStripTypes: forceStripTypes,
           enableMinification: enableMinification);
     }
   }
 
   static PlaceholderCollector collectPlaceholders(
-      DiagnosticListener listener,
+      DiagnosticReporter listener,
       MirrorRenamer mirrorRenamer,
       FunctionElement mainFunction,
       LibraryInfo libraryInfo,
       ElementInfo elementInfo) {
     // Create all necessary placeholders.
     PlaceholderCollector collector = new PlaceholderCollector(
         listener,
         mirrorRenamer,
         libraryInfo.fixedDynamicNames,
         elementInfo.elementAsts,
@@ skipping 26 matching lines @@
         libraryInfo.fixedDynamicNames,
         libraryInfo.fixedStaticNames,
         libraryInfo.reexportingLibraries,
         cutDeclarationTypes: shouldCutDeclarationTypes,
         enableMinification: enableMinification);
 
     placeholderRenamer.computeRenames(collector);
     return placeholderRenamer;
   }
 
-  static String astOutput(DiagnosticListener listener,
+  static String astOutput(DiagnosticReporter listener,
                           ElementInfo elementInfo) {
     // TODO(antonm): Ideally XML should be a separate backend.
     // TODO(antonm): obey renames and minification, at least as an option.
     StringBuffer sb = new StringBuffer();
     outputElement(element) {
       sb.write(element.parseNode(listener).toDebugString());
     }
 
     // Emit XML for AST instead of the program.
     for (Element topLevel in elementInfo.topLevelElements) {
@@ skipping 14 matching lines @@
   final Set<String> fixedDynamicNames;
   final Map<Element, LibraryElement> reexportingLibraries;
   final List<LibraryElement> userLibraries;
 
   LibraryInfo(this.fixedStaticNames,
               this.fixedDynamicNames,
               this.reexportingLibraries,
               this.userLibraries);
 
   static LibraryInfo processLibraries(
-      DiagnosticListener listener,
+      DiagnosticReporter reporter,
       Iterable<LibraryElement> libraries,
       Iterable<AstElement> resolvedElements) {
     Set<String> fixedStaticNames = new Set<String>();
     Set<String> fixedDynamicNames = new Set<String>();
     Map<Element, LibraryElement> reexportingLibraries =
           <Element, LibraryElement>{};
     List<LibraryElement> userLibraries = <LibraryElement>[];
     // Conservatively traverse all platform libraries and collect member names.
     // TODO(antonm): ideally we should only collect names of used members,
     // however as of today there are problems with names of some core library
@@ skipping 49 matching lines @@
           fixedDynamicNames.add(parameter.name);
         }
       }
       ClassElement cls = element.enclosingClass;
       if (cls != null && cls.isEnumClass) {
         fixedDynamicNames.add('index');
 
         ClassElement existingEnumClass =
             enumClassMap.putIfAbsent(cls.name, () => cls);
         if (existingEnumClass != cls) {
-          listener.reportError(
-              listener.createMessage(
+          reporter.reportError(
+              reporter.createMessage(
                   cls,
                   MessageKind.GENERIC,
                   {'text': "Duplicate enum names are not supported "
                            "in dart2dart."}),
           <DiagnosticMessage>[
-              listener.createMessage(
+              reporter.createMessage(
                   existingEnumClass,
                   MessageKind.GENERIC,
                   {'text': "This is the other declaration of '${cls.name}'."}),
           ]);
         }
       }
     }
 
     fixedStaticNames.addAll(enumClassMap.keys);
 
@@ skipping 276 matching lines @@
       outputProvider("", "dart")
            ..add(code)
            ..close();
 
       totalSize = code.length;
     }
 
     return totalSize;
   }
 }