Refactor CompilerOutput

pkg/compiler/lib/src/tracer.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 tracer;
 
-import 'dart:async' show EventSink;
-
-import '../compiler.dart' as api;
+import '../compiler_new.dart' as api;
+import 'compiler.dart' show Compiler;
 import 'js_backend/namer.dart' show Namer;
 import 'ssa/nodes.dart' as ssa show HGraph;
 import 'ssa/ssa_tracer.dart' show HTracer;
 import 'util/util.dart' show Indentation;
 import 'world.dart' show ClosedWorld;
 
 /**
  * If non-null, we only trace methods whose name match the regexp defined by the
  * given pattern.
  */
 String get TRACE_FILTER_PATTERN =>
     TRACE_FILTER_PATTERN_FROM_ENVIRONMENT ?? TRACE_FILTER_PATTERN_FOR_TEST;
 
 const String TRACE_FILTER_PATTERN_FROM_ENVIRONMENT =
     const String.fromEnvironment("DUMP_IR");
 String TRACE_FILTER_PATTERN_FOR_TEST;
 
 /**
  * Dumps the intermediate representation after each phase in a format
  * readable by IR Hydra.
  */
 class Tracer extends TracerUtil {
   final ClosedWorld closedWorld;
   final Namer namer;
   bool traceActive = false;
-  final EventSink<String> output;
+  final api.OutputSink output;
   final RegExp traceFilter;
 
-  Tracer(
-      this.closedWorld, this.namer, api.CompilerOutputProvider outputProvider)
+  Tracer(this.closedWorld, this.namer, Compiler compiler)
       : traceFilter = TRACE_FILTER_PATTERN == null
             ? null
             : new RegExp(TRACE_FILTER_PATTERN),
-        output =
-            TRACE_FILTER_PATTERN != null ? outputProvider('dart', 'cfg') : null;
+        output = TRACE_FILTER_PATTERN != null
+            ? compiler.outputProvider('dart', 'cfg', api.OutputType.debug)
+            : null;
 
   bool get isEnabled => traceFilter != null;
 
   void traceCompilation(String methodName) {
     if (!isEnabled) return;
     traceActive = traceFilter.hasMatch(methodName);
     if (!traceActive) return;
     tag("compilation", () {
       printProperty("name", methodName);
       printProperty("method", methodName);
       printProperty("date", new DateTime.now().millisecondsSinceEpoch);
     });
   }
 
   void traceGraph(String name, var irObject) {
     if (!traceActive) return;
     if (irObject is ssa.HGraph) {
       new HTracer(output, closedWorld, namer).traceGraph(name, irObject);
     }
   }
 
   void close() {
     if (output != null) {
       output.close();
     }
   }
 }
 
 abstract class TracerUtil {
-  EventSink<String> get output;
+  api.OutputSink get output;
   final Indentation _ind = new Indentation();
 
   void tag(String tagName, Function f) {
     println("begin_$tagName");
     _ind.indentBlock(f);
     println("end_$tagName");
   }
 
   void println(String string) {
     addIndent();
@@ skipping 22 matching lines @@
   }
 
   void add(String string) {
     output.add(string);
   }
 
   void addIndent() {
     add(_ind.indentation);
   }
 }