dart2js: remove references to compiler in ResolvedUriTranslator

pkg/compiler/lib/src/apiimpl.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 leg_apiimpl;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:package_config/packages.dart';
 import 'package:package_config/packages_file.dart' as pkgs;
 import 'package:package_config/src/packages_impl.dart'
     show MapPackages, NonFilePackagesDirectoryPackages;
 import 'package:package_config/src/util.dart' show checkValidPackageUri;
 
 import '../compiler_new.dart' as api;
+import 'common/tasks.dart' show GenericTask;
 import 'common.dart';
-import 'common/tasks.dart' show GenericTask;
 import 'compiler.dart';
 import 'diagnostics/messages.dart' show Message;
 import 'elements/elements.dart' as elements;
 import 'environment.dart';
 import 'io/source_file.dart';
 import 'options.dart' show CompilerOptions;
 import 'platform_configuration.dart' as platform_configuration;
+import 'resolved_uri_translator.dart';
 import 'script.dart';
 
 /// Implements the [Compiler] using a [api.CompilerInput] for supplying the
 /// sources.
 class CompilerImpl extends Compiler {
   api.CompilerInput provider;
   api.CompilerDiagnostics handler;
   Packages packages;
-  bool mockableLibraryUsed = false;
 
-  /// A mapping of the dart: library-names to their location.
-  ///
-  /// Initialized in [setupSdk].
-  Map<String, Uri> sdkLibraries;
+  bool get mockableLibraryUsed => resolvedUriTranslator.isSet
+      ? resolvedUriTranslator.mockableLibraryUsed
+      : false;
+
+  ForwardingResolvedUriTranslator resolvedUriTranslator;
 
   GenericTask userHandlerTask;
   GenericTask userProviderTask;
   GenericTask userPackagesDiscoveryTask;
 
   Uri get libraryRoot => options.platformConfigUri.resolve(".");
 
   CompilerImpl(this.provider, api.CompilerOutput outputProvider, this.handler,
       CompilerOptions options)
-      : super(
+      : resolvedUriTranslator = new ForwardingResolvedUriTranslator(),
+        super(
             options: options,
             outputProvider: outputProvider,
             environment: new _Environment(options.environment)) {
     _Environment env = environment;
     env.compiler = this;
     tasks.addAll([
       userHandlerTask = new GenericTask('Diagnostic handler', this),
       userProviderTask = new GenericTask('Input provider', this),
       userPackagesDiscoveryTask = new GenericTask('Package discovery', this),
     ]);
   }
 
   void log(message) {
     callUserHandler(
         null, null, null, null, message, api.Diagnostic.VERBOSE_INFO);
   }
 
-  /// See [Compiler.translateResolvedUri].
-  Uri translateResolvedUri(elements.LibraryElement importingLibrary,
-      Uri resolvedUri, Spannable spannable) {
-    if (resolvedUri.scheme == 'dart') {
-      return translateDartUri(importingLibrary, resolvedUri, spannable);
-    }
-    return resolvedUri;
-  }
-
   /**
    * Reads the script designated by [readableUri].
    */
   Future<Script> readScript(Uri readableUri, [Spannable node]) {
     if (!readableUri.isAbsolute) {
       if (node == null) node = NO_LOCATION_SPANNABLE;
       reporter.internalError(
           node, 'Relative uri $readableUri provided to readScript(Uri).');
     }
 
@@ skipping 56 matching lines @@
   }
 
   /**
    * Translates a readable URI into a resource URI.
    *
    * See [LibraryLoader] for terminology on URIs.
    */
   Uri translateUri(Spannable node, Uri uri) =>
       uri.scheme == 'package' ? translatePackageUri(node, uri) : uri;
 
-  /// Translates "resolvedUri" with scheme "dart" to a [uri] resolved relative
-  /// to `options.platformConfigUri` according to the information in the file at
-  /// `options.platformConfigUri`.
-  ///
-  /// Returns null and emits an error if the library could not be found or
-  /// imported into [importingLibrary].
-  ///
-  /// Internal libraries (whose name starts with '_') can be only resolved if
-  /// [importingLibrary] is a platform or patch library.
-  Uri translateDartUri(elements.LibraryElement importingLibrary,
-      Uri resolvedUri, Spannable spannable) {
-    Uri location = lookupLibraryUri(resolvedUri.path);
-
-    if (location == null) {
-      reporter.reportErrorMessage(spannable, MessageKind.LIBRARY_NOT_FOUND,
-          {'resolvedUri': resolvedUri});
-      return null;
-    }
-
-    if (resolvedUri.path.startsWith('_')) {
-      bool allowInternalLibraryAccess = importingLibrary != null &&
-          (importingLibrary.isPlatformLibrary ||
-              importingLibrary.isPatch ||
-              importingLibrary.canonicalUri.path
-                  .contains('sdk/tests/compiler/dart2js_native'));
-
-      if (!allowInternalLibraryAccess) {
-        if (importingLibrary != null) {
-          reporter.reportErrorMessage(
-              spannable, MessageKind.INTERNAL_LIBRARY_FROM, {
-            'resolvedUri': resolvedUri,
-            'importingUri': importingLibrary.canonicalUri
-          });
-        } else {
-          reporter.reportErrorMessage(spannable, MessageKind.INTERNAL_LIBRARY,
-              {'resolvedUri': resolvedUri});
-          registerDisallowedLibraryUse(resolvedUri);
-        }
-        return null;
-      }
-    }
-
-    if (location.scheme == "unsupported") {
-      reporter.reportErrorMessage(spannable, MessageKind.LIBRARY_NOT_SUPPORTED,
-          {'resolvedUri': resolvedUri});
-      registerDisallowedLibraryUse(resolvedUri);
-      return null;
-    }
-
-    if (resolvedUri.path == 'html' || resolvedUri.path == 'io') {
-      // TODO(ahe): Get rid of mockableLibraryUsed when test.dart
-      // supports this use case better.
-      mockableLibraryUsed = true;
-    }
-    return location;
-  }
-
   Uri translatePackageUri(Spannable node, Uri uri) {
     try {
       checkValidPackageUri(uri);
     } on ArgumentError catch (e) {
       reporter.reportErrorMessage(node, MessageKind.INVALID_PACKAGE_URI,
           {'uri': uri, 'exception': e.message});
       return null;
     }
     return packages.resolve(uri, notFound: (Uri notFound) {
       reporter.reportErrorMessage(
           node, MessageKind.LIBRARY_NOT_FOUND, {'resolvedUri': uri});
       return null;
     });
   }
 
   Future<elements.LibraryElement> analyzeUri(Uri uri,
       {bool skipLibraryWithPartOfTag: true}) {
     List<Future> setupFutures = new List<Future>();
-    if (sdkLibraries == null) {
+    if (resolvedUriTranslator.isNotSet) {
       setupFutures.add(setupSdk());
     }
     if (packages == null) {
       setupFutures.add(setupPackages(uri));
     }
     return Future.wait(setupFutures).then((_) {
       return super
           .analyzeUri(uri, skipLibraryWithPartOfTag: skipLibraryWithPartOfTag);
     });
   }
@@ skipping 28 matching lines @@
       } else {
         return callUserPackagesDiscovery(uri).then((p) {
           packages = p;
         });
       }
     }
     return new Future.value();
   }
 
   Future<Null> setupSdk() {
-    if (sdkLibraries == null) {
+    if (resolvedUriTranslator.isNotSet) {
       return platform_configuration
           .load(options.platformConfigUri, provider)
           .then((Map<String, Uri> mapping) {
-        sdkLibraries = mapping;
+        resolvedUriTranslator.resolvedUriTranslator =
+            new ResolvedUriTranslator(mapping, reporter);
       });
     } else {
       // The incremental compiler sets up the sdk before run.
       // Therefore this will be called a second time.
       return new Future.value(null);
     }
   }
 
   Future<bool> run(Uri uri) {
     log('Using platform configuration at ${options.platformConfigUri}');
 
     return Future.wait([setupSdk(), setupPackages(uri)]).then((_) {
-      assert(sdkLibraries != null);
+      assert(resolvedUriTranslator.isSet);
       assert(packages != null);
 
       return super.run(uri).then((bool success) {
         int cumulated = 0;
         for (final task in tasks) {
           int elapsed = task.timing;
           if (elapsed != 0) {
             cumulated += elapsed;
             log('${task.name} took ${elapsed}msec');
             for (String subtask in task.subtasks) {
@@ skipping 44 matching lines @@
 
   Future callUserProvider(Uri uri) {
     return userProviderTask.measure(() => provider.readFromUri(uri));
   }
 
   Future<Packages> callUserPackagesDiscovery(Uri uri) {
     return userPackagesDiscoveryTask
         .measure(() => options.packagesDiscoveryProvider(uri));
   }
 
-  Uri lookupLibraryUri(String libraryName) {
-    assert(invariant(NO_LOCATION_SPANNABLE, sdkLibraries != null,
-        message: "setupSdk() has not been run"));
-    return sdkLibraries[libraryName];
-  }
-
   Uri resolvePatchUri(String libraryName) {
     return backend.resolvePatchUri(libraryName, options.platformConfigUri);
   }
 }
 
 class _Environment implements Environment {
   final Map<String, String> definitions;
 
   // TODO(sigmund): break the circularity here: Compiler needs an environment to
-  // intialize the library loader, but the environment here needs to know about
+  // initialize the library loader, but the environment here needs to know about
   // how the sdk is set up and about whether the backend supports mirrors.
   CompilerImpl compiler;
 
   _Environment(this.definitions);
 
   String valueOf(String name) {
-    assert(invariant(NO_LOCATION_SPANNABLE, compiler.sdkLibraries != null,
+    assert(invariant(
+        NO_LOCATION_SPANNABLE, compiler.resolvedUriTranslator != null,
         message: "setupSdk() has not been run"));
 
     var result = definitions[name];
     if (result != null || definitions.containsKey(name)) return result;
     if (!name.startsWith(_dartLibraryEnvironmentPrefix)) return null;
 
     String libraryName = name.substring(_dartLibraryEnvironmentPrefix.length);
 
     // Private libraries are not exposed to the users.
     if (libraryName.startsWith("_")) return null;
 
-    if (compiler.sdkLibraries.containsKey(libraryName)) {
+    if (compiler.resolvedUriTranslator.sdkLibraries.containsKey(libraryName)) {
       // Dart2js always "supports" importing 'dart:mirrors' but will abort
       // the compilation at a later point if the backend doesn't support
       // mirrors. In this case 'mirrors' should not be in the environment.
       if (libraryName == 'mirrors') {
         return compiler.backend.supportsReflection ? "true" : null;
       }
       return "true";
     }
     return null;
   }
 }
 
 /// For every 'dart:' library, a corresponding environment variable is set
 /// to "true". The environment variable's name is the concatenation of
 /// this prefix and the name (without the 'dart:'.
 ///
 /// For example 'dart:html' has the environment variable 'dart.library.html' set
 /// to "true".
 const String _dartLibraryEnvironmentPrefix = 'dart.library.';