Change MirrorSystem.libraries to Map<Uri, String>

sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.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 mirrors_dart2js;
 
 import 'dart:async';
 import 'dart:collection' show LinkedHashMap;
 import 'dart:io' show Path;
 import 'dart:uri';
@@ skipping 191 matching lines @@
  * has been successfully compiled.
  *
  * TODO(johnniwinther): The method is deprecated but here to support [Path]
  * which is used through dartdoc.
  */
 Future<String> compile(Path script,
                        Path libraryRoot,
                        {Path packageRoot,
                         List<String> options: const <String>[],
                         api.DiagnosticHandler diagnosticHandler}) {
-  Uri cwd = getCurrentDirectory();
   SourceFileProvider provider = new SourceFileProvider();
   if (diagnosticHandler == null) {
     diagnosticHandler =
         new FormattingDiagnosticHandler(provider).diagnosticHandler;
   }
-  Uri scriptUri = cwd.resolve(script.toString());
-  Uri libraryUri = cwd.resolve(appendSlash('$libraryRoot'));
+  Uri scriptUri = currentDirectory.resolve(script.toString());
+  Uri libraryUri = currentDirectory.resolve(appendSlash('$libraryRoot'));
   Uri packageUri = null;
   if (packageRoot != null) {
-    packageUri = cwd.resolve(appendSlash('$packageRoot'));
+    packageUri = currentDirectory.resolve(appendSlash('$packageRoot'));
   }
   return api.compile(scriptUri, libraryUri, packageUri,
       provider.readStringFromUri, diagnosticHandler, options);
 }
 
 /**
  * Analyzes set of libraries and provides a mirror system which can be used for
  * static inspection of the source code.
  */
 // TODO(johnniwinther): Move this to [compiler/compiler.dart] and rename to
@@ skipping 42 matching lines @@
  * Analyzes set of libraries and provides a mirror system which can be used for
  * static inspection of the source code.
  */
 // TODO(johnniwinther): Move dart:io dependent parts outside
 // dart2js_mirror.dart.
 Future<MirrorSystem> analyze(List<Path> libraries,
                              Path libraryRoot,
                              {Path packageRoot,
                               List<String> options: const <String>[],
                               api.DiagnosticHandler diagnosticHandler}) {
-  Uri cwd = getCurrentDirectory();
   SourceFileProvider provider = new SourceFileProvider();
   if (diagnosticHandler == null) {
     diagnosticHandler =
         new FormattingDiagnosticHandler(provider).diagnosticHandler;
   }
-  Uri libraryUri = cwd.resolve(appendSlash('$libraryRoot'));
+  Uri libraryUri = currentDirectory.resolve(appendSlash('$libraryRoot'));
   Uri packageUri = null;
   if (packageRoot != null) {
-    packageUri = cwd.resolve(appendSlash('$packageRoot'));
+    packageUri = currentDirectory.resolve(appendSlash('$packageRoot'));
   }
   List<Uri> librariesUri = <Uri>[];
   for (Path library in libraries) {
-    librariesUri.add(cwd.resolve(library.toString()));
+    librariesUri.add(currentDirectory.resolve(library.toString()));
   }
   return analyzeUri(librariesUri, libraryUri, packageUri,
                     provider.readStringFromUri, diagnosticHandler, options);
 }
 
 //------------------------------------------------------------------------------
 // Dart2Js specific extensions of mirror interfaces
 //------------------------------------------------------------------------------
 
 abstract class Dart2JsMirror implements Mirror {
@@ skipping 149 matching lines @@
 
   bool get isStatic => false;
 
   bool get isParameter => false;
 }
 
 //------------------------------------------------------------------------------
 // Mirror system implementation.
 //------------------------------------------------------------------------------
 
-class Dart2JsMirrorSystem implements MirrorSystem {
+class Dart2JsMirrorSystem extends MirrorSystem {
   final Compiler compiler;
-  Map<String, Dart2JsLibraryMirror> _libraries;
+  Map<Uri, Dart2JsLibraryMirror> _libraries;
   Map<LibraryElement, Dart2JsLibraryMirror> _libraryMap;
 
   Dart2JsMirrorSystem(this.compiler)
     : _libraryMap = new Map<LibraryElement, Dart2JsLibraryMirror>();
 
   void _ensureLibraries() {
     if (_libraries == null) {
-      _libraries = <String, Dart2JsLibraryMirror>{};
+      _libraries = new Map<Uri, Dart2JsLibraryMirror>();
       compiler.libraries.forEach((_, LibraryElement v) {
         var mirror = new Dart2JsLibraryMirror(mirrors, v);
-        _libraries[mirror.simpleName] = mirror;
+        _libraries[mirror.uri] = mirror;
         _libraryMap[v] = mirror;
       });
     }
   }
 
-  Map<String, LibraryMirror> get libraries {
+  Map<Uri, LibraryMirror> get libraries {
     _ensureLibraries();
-    return new ImmutableMapWrapper<String, LibraryMirror>(_libraries);
+    return new ImmutableMapWrapper<Uri, LibraryMirror>(_libraries);
   }
 
   Dart2JsLibraryMirror _getLibrary(LibraryElement element) =>
       _libraryMap[element];
 
   Dart2JsMirrorSystem get mirrors => this;
 
   TypeMirror get dynamicType =>
       _convertTypeToTypeMirror(this, compiler.types.dynamicType, null);
 
@@ skipping 1249 matching lines @@
       return new Future.value(
           new Dart2JsStringConstantMirror.fromString(mirrors, text));
     } else if (fieldName == 'trimmedText') {
       return new Future.value(
           new Dart2JsStringConstantMirror.fromString(mirrors, trimmedText));
     }
     // TODO(johnniwinther): Which exception/error should be thrown here?
     throw new UnsupportedError('InstanceMirror does not have a reflectee');
   }
 }