Change MirrorSystem.libraries to Map<Uri, String>

sdk/lib/_internal/compiler/implementation/dart2js.dart

Index: sdk/lib/_internal/compiler/implementation/dart2js.dart
diff --git a/sdk/lib/_internal/compiler/implementation/dart2js.dart b/sdk/lib/_internal/compiler/implementation/dart2js.dart
index af7befd724449e1007a0d10ca178c676dca1dcd4..a020e637933719b6baebde11c5d0cf15fddf34cd 100644
--- a/sdk/lib/_internal/compiler/implementation/dart2js.dart
+++ b/sdk/lib/_internal/compiler/implementation/dart2js.dart
@@ -70,10 +70,9 @@ void parseCommandLine(List<OptionHandler> handlers, List<String> argv) {
 
 void compile(List<String> argv) {
   bool isWindows = (Platform.operatingSystem == 'windows');
-  Uri cwd = getCurrentDirectory();
-  Uri libraryRoot = cwd;
-  Uri out = cwd.resolve('out.js');
-  Uri sourceMapOut = cwd.resolve('out.js.map');
+  Uri libraryRoot = currentDirectory;

[ahe, 2013/04/09 08:28:44]

This change is unrelated to the mirror system change.

[Johnni Winther, 2013/04/22 13:00:02]

Sorry for the pollution.

+  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;
@@ -88,16 +87,16 @@ void compile(List<String> argv) {
   passThrough(String argument) => options.add(argument);
 
   setLibraryRoot(String argument) {
-    libraryRoot = cwd.resolve(extractPath(argument));
+    libraryRoot = currentDirectory.resolve(extractPath(argument));
   }
 
   setPackageRoot(String argument) {
-    packageRoot = cwd.resolve(extractPath(argument));
+    packageRoot = currentDirectory.resolve(extractPath(argument));
   }
 
   setOutput(String argument) {
     explicitOut = true;
-    out = cwd.resolve(nativeToUriPath(extractParameter(argument)));
+    out = currentDirectory.resolve(nativeToUriPath(extractParameter(argument)));
     sourceMapOut = Uri.parse('$out.map');
   }
 
@@ -105,8 +104,8 @@ void compile(List<String> argv) {
     if (argument == '--output-type=dart') {
       outputLanguage = OUTPUT_LANGUAGE_DART;
       if (!explicitOut) {
-        out = cwd.resolve('out.dart');
-        sourceMapOut = cwd.resolve('out.dart.map');
+        out = currentDirectory.resolve('out.dart');
+        sourceMapOut = currentDirectory.resolve('out.dart.map');
       }
     }
     passThrough(argument);
@@ -240,7 +239,7 @@ void compile(List<String> argv) {
     diagnosticHandler.diagnosticHandler(uri, begin, end, message, kind);
   }
 
-  Uri uri = cwd.resolve(arguments[0]);
+  Uri uri = currentDirectory.resolve(arguments[0]);
   if (packageRoot == null) {
     packageRoot = uri.resolve('./packages/');
   }
@@ -259,10 +258,10 @@ void compile(List<String> argv) {
     diagnosticHandler.info(
          'compiled ${inputProvider.dartCharactersRead} characters Dart '
          '-> $charactersWritten characters $outputLanguage '
-         'in ${relativize(cwd, out, isWindows)}');
+         'in ${relativize(currentDirectory, out, isWindows)}');
     if (!explicitOut) {
       String input = uriPathToNative(arguments[0]);
-      String output = relativize(cwd, out, isWindows);
+      String output = relativize(currentDirectory, out, isWindows);
       print('Dart file $input compiled to $outputLanguage: $output');
     }
   }