First pass at asynchronous input loading in dart2js.

sdk/lib/_internal/compiler/implementation/dart2js.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.cmdline;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:math' as math;
 
@@ skipping 73 matching lines @@
         } else {
           handler.handle(argument);
         }
         continue OUTER;
       }
     }
     throw 'Internal error: "$argument" did not match';
   }
 }
 
-void compile(List<String> argv) {
+Future compile(List<String> argv) {
   bool isWindows = (Platform.operatingSystem == 'windows');
   stackTraceFilePrefix = '$currentDirectory';
   Uri libraryRoot = currentDirectory;
   Uri out = currentDirectory.resolve('out.js');
   Uri sourceMapOut = currentDirectory.resolve('out.js.map');
   Uri packageRoot = null;
   List<String> options = new List<String>();
   bool explicitOut = false;
   bool wantHelp = false;
   bool wantVersion = false;
   String outputLanguage = 'JavaScript';
   bool stripArgumentSet = false;
   bool analyzeOnly = false;
+  // TODO(johnniwinther): Measure time for reading files.
   SourceFileProvider inputProvider = new SourceFileProvider();
   FormattingDiagnosticHandler diagnosticHandler =
       new FormattingDiagnosticHandler(inputProvider);
 
   passThrough(String argument) => options.add(argument);
 
   if (BUILD_ID != null) {
     passThrough("--build-id=$BUILD_ID");
   }
 
@@ skipping 162 matching lines @@
         '--output-type=dart');
   }
   if (arguments.isEmpty) {
     helpAndFail('Error: No Dart file specified.');
   }
   if (arguments.length > 1) {
     var extra = arguments.sublist(1);
     helpAndFail('Error: Extra arguments: ${extra.join(" ")}');
   }
 
-  void handler(Uri uri, int begin, int end, String message,
-               api.Diagnostic kind) {
-    diagnosticHandler.diagnosticHandler(uri, begin, end, message, kind);
-  }
-
   Uri uri = currentDirectory.resolve(arguments[0]);
   if (packageRoot == null) {
     packageRoot = uri.resolve('./packages/');
   }
 
   diagnosticHandler.info('package root is $packageRoot');
 
   int totalCharactersWritten = 0;
 
   options.add('--source-map=$sourceMapOut');
@@ skipping 74 matching lines @@
       }
       output.closeSync();
       if (isPrimaryOutput) {
         totalCharactersWritten += charactersWritten;
       }
     }
 
     return new EventSinkWrapper(writeStringSync, onDone);
   }
 
-  api.compile(uri, libraryRoot, packageRoot,
-              inputProvider.readStringFromUri, handler,
+  return api.compile(uri, libraryRoot, packageRoot,
+              inputProvider, diagnosticHandler,
               options, outputProvider)
-      .then(compilationDone);
+            .then(compilationDone);
 }
 
 class EventSinkWrapper extends EventSink<String> {
   var onAdd, onClose;
 
   EventSinkWrapper(this.onAdd, this.onClose);
 
   void add(String data) => onAdd(data);
 
   void addError(error) => throw error;
@@ skipping 14 matching lines @@
   var file = new File(uriPathToNative(uri.path)).openSync(mode: FileMode.WRITE);
   file.writeStringSync(text);
   file.closeSync();
 }
 
 void fail(String message) {
   print(message);
   exit(1);
 }
 
-void compilerMain(Options options) {
+Future compilerMain(Options options) {
   var root = uriPathToNative("/$LIBRARY_ROOT");
   List<String> argv = ['--library-root=${options.script}$root'];
   argv.addAll(options.arguments);
-  compile(argv);
+  return compile(argv);
 }
 
 void help() {
   // This message should be no longer than 20 lines. The default
   // terminal size normally 80x24. Two lines are used for the prompts
   // before and after running the compiler. Another two lines may be
   // used to print an error message.
   print('''
 Usage: dart2js [options] dartfile
 
@@ skipping 117 matching lines @@
   exit(0);
 }
 
 void helpAndFail(String message) {
   help();
   print('');
   fail(message);
 }
 
 void mainWithErrorHandler(Options options) {
-  try {
-    compilerMain(options);
-  } catch (exception, trace) {
+  compilerMain(options).catchError((exception) {

[ahe, 2013/09/02 13:43:24]

Wrap the call to compilerMain in try-catch.

[Johnni Winther, 2013/09/03 07:51:39]

Done.

     try {
       print('Internal error: $exception');
     } catch (ignored) {
       print('Internal error: error while printing exception');
     }
+
     try {
-      print(trace);
+      var trace = getAttachedStackTrace(exception);
+      if (trace != null) {
+        print(trace);
+      }
     } finally {
       exit(253); // 253 is recognized as a crash by our test scripts.
     }
-  }
+  });
 }
 
 void main() {
   mainWithErrorHandler(new Options());
 }