Refactor CompilerOutput

pkg/compiler/lib/src/compiler.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.
 
 library dart2js.compiler_base;
 
 import 'dart:async' show EventSink, Future;
 
 import '../compiler_new.dart' as api;
 import 'closure.dart' as closureMapping show ClosureTask;
@@ skipping 640 matching lines @@
         if (compilationFailed) {
           if (!options.generateCodeWithCompileTimeErrors) return;
           if (!backend
               .enableCodegenWithErrorsIfSupported(NO_LOCATION_SPANNABLE)) {
             return;
           }
         }
 
         if (options.resolveOnly && !compilationFailed) {
           reporter.log('Serializing to ${options.resolutionOutput}');
-          serialization
-              .serializeToSink(userOutputProvider.createEventSink('', 'data'),
-                  libraryLoader.libraries.where((LibraryElement library) {
+          serialization.serializeToSink(
+              userOutputProvider.createOutputSink(
+                  '', 'data', api.OutputType.serialization_data),
+              libraryLoader.libraries.where((LibraryElement library) {
             return !serialization.isDeserialized(library);
           }));
         }
         if (options.analyzeOnly) {
           if (!analyzeAll && !compilationFailed) {
             // No point in reporting unused code when [analyzeAll] is true: all
             // code is artificially used.
             // If compilation failed, it is possible that the error prevents the
             // compiler from analyzing all the code.
             // TODO(johnniwinther): Reenable this when the reporting is more
@@ skipping 400 matching lines @@
         // TODO(zarah): Extend element model to represent compile-time
         // errors instead of using a map.
         element = mainFunction;
       }
       elementsWithCompileTimeErrors
           .putIfAbsent(element, () => <DiagnosticMessage>[])
           .add(message);
     }
   }
 
-  EventSink<String> outputProvider(String name, String extension) {
+  api.OutputSink outputProvider(
+      String name, String extension, api.OutputType type) {
     if (compilationFailed) {
       if (!options.generateCodeWithCompileTimeErrors || options.testMode) {
         // Disable output in test mode: The build bot currently uses the time
         // stamp of the generated file to determine whether the output is
         // up-to-date.
-        return new NullSink('$name.$extension');
+        return NullSink.outputProvider(name, extension, type);
       }
     }
-    return userOutputProvider.createEventSink(name, extension);
+    return userOutputProvider.createOutputSink(name, extension, type);
   }
 }
 
 /// Information about suppressed warnings and hints for a given library.
 class SuppressionInfo {
   int warnings = 0;
   int hints = 0;
 }
 
 class _CompilerCommonElements extends CommonElementsMixin {
@@ skipping 963 matching lines @@
     if (library != null && library.isSynthesized) {
       return null;
     }
     if (library == null && required) {
       throw new SpannableAssertionFailure(
           library, "The library '${uri}' was not found.");
     }
     return library;
   }
 }