Add interfaces for a new compiler API.

tests/compiler/dart2js/memory_compiler.dart

 // Copyright (c) 2013, 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.test.memory_compiler;
 
 import 'memory_source_file_helper.dart';
 
-import 'package:compiler/src/compile_time_constants.dart';
 
-import 'package:compiler/src/dart2jslib.dart'
-       show NullSink;
+import 'package:compiler/src/null_compiler_output.dart'
+       show NullCompilerOutput;
 
 import 'package:compiler/compiler.dart' show
-    CompilerOutputProvider,
+    DiagnosticHandler;
+
+import 'package:compiler/compiler_new.dart' show
+    CompilerDiagnostics,
+    CompilerOutput,
     Diagnostic,
-    DiagnosticHandler,
     PackagesDiscoveryProvider;
 
 import 'dart:async';
 
 import 'package:compiler/src/mirrors/source_mirrors.dart';
 import 'package:compiler/src/mirrors/analyze.dart';
 
 import 'package:compiler/src/library_loader.dart'
     show LoadedLibraries;
 
+import 'package:compiler/src/old_to_new_api.dart';
+
 export 'output_collector.dart';
 
 class DiagnosticMessage {
   final Uri uri;
   final int begin;
   final int end;
   final String message;
   final Diagnostic kind;
 
   DiagnosticMessage(this.uri, this.begin, this.end, this.message, this.kind);
 
   String toString() => '$uri:$begin:$end:$message:$kind';
 }
 
-class DiagnosticCollector {
+class DiagnosticCollector implements CompilerDiagnostics {
   List<DiagnosticMessage> messages = <DiagnosticMessage>[];
 
-  void call(Uri uri, int begin, int end, String message,
-                         Diagnostic kind) {
+  void call(Uri uri, int begin, int end, String message, Diagnostic kind) {
+    reportDiagnostic(uri, begin, end, message, kind);
+  }
+
+  @override
+  void reportDiagnostic(Uri uri, int begin, int end, String message,
+                        Diagnostic kind) {
     messages.add(new DiagnosticMessage(uri, begin, end, message, kind));
   }
 
   Iterable<DiagnosticMessage> filterMessagesByKind(Diagnostic kind) {
     return messages.where(
       (DiagnosticMessage message) => message.kind == kind);
   }
 
   Iterable<DiagnosticMessage> get errors {
     return filterMessagesByKind(Diagnostic.ERROR);
   }
 
   Iterable<DiagnosticMessage> get warnings {
     return filterMessagesByKind(Diagnostic.WARNING);
   }
 
   Iterable<DiagnosticMessage> get hints {
     return filterMessagesByKind(Diagnostic.HINT);
   }
 
   Iterable<DiagnosticMessage> get infos {
     return filterMessagesByKind(Diagnostic.INFO);
   }
+
+  /// `true` if non-verbose messages has been collected.
+  bool get hasRegularMessages {
+    return messages.any((m) => m.kind != Diagnostic.VERBOSE_INFO);
+  }
 }
 
-DiagnosticHandler createDiagnosticHandler(DiagnosticHandler diagnosticHandler,
-                                          SourceFileProvider provider,
-                                          bool showDiagnostics) {
-  var handler = diagnosticHandler;
+class MultiDiagnostics implements CompilerDiagnostics {
+  final List<CompilerDiagnostics> diagnosticsList;
+
+  const MultiDiagnostics([this.diagnosticsList = const []]);
+
+  @override
+  void reportDiagnostic(Uri uri, int begin, int end,
+                        String message, Diagnostic kind) {
+    for (CompilerDiagnostics diagnostics in diagnosticsList) {
+      diagnostics.reportDiagnostic(uri, begin, end, message, kind);
+    }
+  }
+}
+
+CompilerDiagnostics createCompilerDiagnostics(
+    CompilerDiagnostics diagnostics,
+    SourceFileProvider provider,
+    bool showDiagnostics) {
+  CompilerDiagnostics handler = diagnostics;
   if (showDiagnostics) {
-    if (diagnosticHandler == null) {
+    if (diagnostics == null) {
       handler = new FormattingDiagnosticHandler(provider);
     } else {
       var formattingHandler = new FormattingDiagnosticHandler(provider);
-      handler = (Uri uri, int begin, int end, String message, Diagnostic kind) {
-        diagnosticHandler(uri, begin, end, message, kind);
-        formattingHandler(uri, begin, end, message, kind);
-      };
+      handler = new MultiDiagnostics([diagnostics, formattingHandler]);
     }
-  } else if (diagnosticHandler == null) {
-    handler = (Uri uri, int begin, int end, String message, Diagnostic kind) {};
+  } else if (diagnostics == null) {
+    handler = new MultiDiagnostics();
   }
   return handler;
 }
 
 Expando<MemorySourceFileProvider> expando =
     new Expando<MemorySourceFileProvider>();
 
 Compiler compilerFor(
     Map<String, String> memorySourceFiles,
-    {DiagnosticHandler diagnosticHandler,
-     CompilerOutputProvider outputProvider,
+    {CompilerDiagnostics diagnosticHandler,
+     CompilerOutput outputProvider,
      List<String> options: const [],
      Compiler cachedCompiler,
      bool showDiagnostics: true,
      Uri packageRoot,
      Uri packageConfig,
      PackagesDiscoveryProvider packagesDiscoveryProvider}) {
   Uri libraryRoot = Uri.base.resolve('sdk/');
   if (packageRoot == null &&
       packageConfig == null &&
       packagesDiscoveryProvider == null) {
     packageRoot = Uri.base.resolveUri(new Uri.file('${Platform.packageRoot}/'));
   }
 
   MemorySourceFileProvider provider;
-  var readStringFromUri;
   if (cachedCompiler == null) {
     provider = new MemorySourceFileProvider(memorySourceFiles);
-    readStringFromUri = provider.readStringFromUri;
     // Saving the provider in case we need it later for a cached compiler.
-    expando[readStringFromUri] = provider;
+    expando[provider] = provider;
   } else {
     // When using a cached compiler, it has read a number of files from disk
     // already (and will not attempt to read them again due to caching). These
     // files must be available to the new diagnostic handler.
     provider = expando[cachedCompiler.provider];
-    readStringFromUri = cachedCompiler.provider;
     provider.memorySourceFiles = memorySourceFiles;
   }
-  var handler =
-      createDiagnosticHandler(diagnosticHandler, provider, showDiagnostics);
+  diagnosticHandler =
+      createCompilerDiagnostics(diagnosticHandler, provider, showDiagnostics);
 
-  EventSink<String> noOutputProvider(String name, String extension) {
-    if (name != '') throw 'Attempt to output file "$name.$extension"';
-    return new NullSink('$name.$extension');
-  }
   if (outputProvider == null) {
-    outputProvider = noOutputProvider;
+    outputProvider = const NullCompilerOutput();
   }
 
   Compiler compiler = new Compiler(
-      readStringFromUri,
+      provider,
       outputProvider,
-      handler,
+      diagnosticHandler,
       libraryRoot,
       packageRoot,
       options,
       {},
       packageConfig,
       packagesDiscoveryProvider);
 
   if (cachedCompiler != null) {
     compiler.coreLibrary =
         cachedCompiler.libraryLoader.lookupLibrary(Uri.parse('dart:core'));
@@ skipping 77 matching lines @@
   @override
   void forEachLibrary(f) {}
 
   @override
   getLibrary(Uri uri) => copiedLibraries[uri];
 
   @override
   Uri get rootUri => null;
 }
 
+
+DiagnosticHandler createDiagnosticHandler(DiagnosticHandler diagnosticHandler,
+                                          SourceFileProvider provider,
+                                          bool showDiagnostics) {
+  var handler = diagnosticHandler;
+  if (showDiagnostics) {
+    if (diagnosticHandler == null) {
+      handler = new FormattingDiagnosticHandler(provider);
+    } else {
+      var formattingHandler = new FormattingDiagnosticHandler(provider);
+      handler = (Uri uri, int begin, int end, String message, Diagnostic kind) {
+        diagnosticHandler(uri, begin, end, message, kind);
+        formattingHandler(uri, begin, end, message, kind);
+      };
+    }
+  } else if (diagnosticHandler == null) {
+    handler = (Uri uri, int begin, int end, String message, Diagnostic kind) {};
+  }
+  return handler;
+}
+
 Future<MirrorSystem> mirrorSystemFor(Map<String,String> memorySourceFiles,
                                      {DiagnosticHandler diagnosticHandler,
                                       List<String> options: const [],
                                       bool showDiagnostics: true}) {
   Uri libraryRoot = Uri.base.resolve('sdk/');
   Uri packageRoot = Uri.base.resolveUri(
       new Uri.file('${Platform.packageRoot}/'));
 
   var provider = new MemorySourceFileProvider(memorySourceFiles);
   var handler =
       createDiagnosticHandler(diagnosticHandler, provider, showDiagnostics);
 
   List<Uri> libraries = <Uri>[];
   memorySourceFiles.forEach((String path, _) {
     libraries.add(new Uri(scheme: 'memory', path: path));
   });
 
   return analyze(libraries, libraryRoot, packageRoot,
                  provider, handler, options);
 }