Change MirrorSystem.libraries to Map<Uri, String>

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;
 
 import 'dart:async';
 import 'dart:collection' show Queue, LinkedHashMap;
 import 'dart:io';
 import 'dart:uri';
@@ skipping 52 matching lines @@
         handlers[i].handle(argument);
         continue OUTER;
       }
     }
     throw 'Internal error: "$argument" did not match';
   }
 }
 
 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;
   bool wantHelp = false;
   String outputLanguage = 'JavaScript';
   bool stripArgumentSet = false;
   bool analyzeOnly = false;
   SourceFileProvider inputProvider = new SourceFileProvider();
   FormattingDiagnosticHandler diagnosticHandler =
       new FormattingDiagnosticHandler(inputProvider);
 
   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');
   }
 
   setOutputType(String argument) {
     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);
   }
 
   String getDepsOutput(Map<String, SourceFile> sourceFiles) {
     var filenames = new List.from(sourceFiles.keys);
     filenames.sort();
     return filenames.join("\n");
   }
@@ skipping 113 matching lines @@
   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 = cwd.resolve(arguments[0]);
+  Uri uri = currentDirectory.resolve(arguments[0]);
   if (packageRoot == null) {
     packageRoot = uri.resolve('./packages/');
   }
 
   diagnosticHandler.info('package root is $packageRoot');
 
   int charactersWritten = 0;
 
   compilationDone(String code) {
     if (analyzeOnly) return;
     if (code == null) {
       fail('Error: Compilation failed.');
     }
     writeString(Uri.parse('$out.deps'),
                 getDepsOutput(inputProvider.sourceFiles));
     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');
     }
   }
 
   EventSink<String> outputProvider(String name, String extension) {
     Uri uri;
     String sourceMapFileName;
     bool isPrimaryOutput = false;
     if (name == '') {
       if (extension == 'js' || extension == 'dart') {
@@ skipping 219 matching lines @@
     } catch (ignored) {
       print('Internal error: error while printing exception');
     }
     try {
       print(trace);
     } finally {
       exit(253); // 253 is recognized as a crash by our test scripts.
     }
   }
 }