Revert "Move dart2jslib parts into separate libraries."

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 '../compiler_new.dart' as api;
+import 'dart2jslib.dart' as leg;
+import 'tree/tree.dart' as tree;
+import 'elements/elements.dart' as elements;
+import 'package:sdk_library_metadata/libraries.dart' hide LIBRARIES;
+import 'package:sdk_library_metadata/libraries.dart' as library_info show LIBRARIES;
+import 'io/source_file.dart';
 import 'package:package_config/packages.dart';
 import 'package:package_config/packages_file.dart' as pkgs;
 import 'package:package_config/src/packages_impl.dart'
     show NonFilePackagesDirectoryPackages, MapPackages;
 import 'package:package_config/src/util.dart' show checkValidPackageUri;
-import 'package:sdk_library_metadata/libraries.dart' hide LIBRARIES;
-import 'package:sdk_library_metadata/libraries.dart' as library_info show LIBRARIES;
-
-import '../compiler_new.dart' as api;
-import 'dart2jslib.dart' as leg;
-import 'elements/elements.dart' as elements;
-import 'io/source_file.dart';
-import 'messages.dart';
-import 'script.dart';
-import 'tree/tree.dart' as tree;
-import 'util/util.dart' show
-    NO_LOCATION_SPANNABLE,
-    Spannable;
 
 const bool forceIncrementalSupport =
     const bool.fromEnvironment('DART2JS_EXPERIMENTAL_INCREMENTAL_SUPPORT');
 
 class Compiler extends leg.Compiler {
   api.CompilerInput provider;
   api.CompilerDiagnostics handler;
   final Uri libraryRoot;
   final Uri packageConfig;
   final Uri packageRoot;
@@ skipping 174 matching lines @@
                            Uri resolvedUri, tree.Node node) {
     if (resolvedUri.scheme == 'dart') {
       return translateDartUri(importingLibrary, resolvedUri, node);
     }
     return resolvedUri;
   }
 
   /**
    * Reads the script designated by [readableUri].
    */
-  Future<Script> readScript(Spannable node, Uri readableUri) {
+  Future<leg.Script> readScript(leg.Spannable node, Uri readableUri) {
     if (!readableUri.isAbsolute) {
-      if (node == null) node = NO_LOCATION_SPANNABLE;
+      if (node == null) node = leg.NO_LOCATION_SPANNABLE;
       internalError(node,
           'Relative uri $readableUri provided to readScript(Uri).');
     }
 
     // We need to store the current element since we are reporting read errors
     // asynchronously and therefore need to restore the current element for
     // [node] to be valid.
     elements.Element element = currentElement;
     void reportReadError(exception) {
       if (element == null || node == null) {
         reportError(
             new leg.SourceSpan(readableUri, 0, 0),
-            MessageKind.READ_SELF_ERROR,
+            leg.MessageKind.READ_SELF_ERROR,
             {'uri': readableUri, 'exception': exception});
       } else {
         withCurrentElement(element, () {
           reportError(
               node,
-              MessageKind.READ_SCRIPT_ERROR,
+              leg.MessageKind.READ_SCRIPT_ERROR,
               {'uri': readableUri, 'exception': exception});
         });
       }
     }
 
     Uri resourceUri = translateUri(node, readableUri);
     if (resourceUri == null) return synthesizeScript(node, readableUri);
     if (resourceUri.scheme == 'dart-ext') {
       if (!allowNativeExtensions) {
         withCurrentElement(element, () {
-          reportError(node, MessageKind.DART_EXT_NOT_SUPPORTED);
+          reportError(node, leg.MessageKind.DART_EXT_NOT_SUPPORTED);
         });
       }
       return synthesizeScript(node, readableUri);
     }
 
     // TODO(johnniwinther): Wrap the result from [provider] in a specialized
     // [Future] to ensure that we never execute an asynchronous action without
     // setting up the current element of the compiler.
     return new Future.sync(() => callUserProvider(resourceUri)).then((data) {
       SourceFile sourceFile;
       if (data is List<int>) {
         sourceFile = new Utf8BytesSourceFile(resourceUri, data);
       } else if (data is String) {
         sourceFile = new StringSourceFile.fromUri(resourceUri, data);
       } else {
         String message = "Expected a 'String' or a 'List<int>' from the input "
                          "provider, but got: ${Error.safeToString(data)}.";
         reportReadError(message);
       }
       // We use [readableUri] as the URI for the script since need to preserve
       // the scheme in the script because [Script.uri] is used for resolving
       // relative URIs mentioned in the script. See the comment on
       // [LibraryLoader] for more details.
-      return new Script(readableUri, resourceUri, sourceFile);
+      return new leg.Script(readableUri, resourceUri, sourceFile);
     }).catchError((error) {
       reportReadError(error);
       return synthesizeScript(node, readableUri);
     });
   }
 
-  Future<Script> synthesizeScript(Spannable node, Uri readableUri) {
+  Future<leg.Script> synthesizeScript(leg.Spannable node, Uri readableUri) {
     return new Future.value(
-        new Script(
+        new leg.Script(
             readableUri, readableUri,
             new StringSourceFile.fromUri(
                 readableUri,
                 "// Synthetic source file generated for '$readableUri'."),
             isSynthesized: true));
   }
 
   /**
    * Translates a readable URI into a resource URI.
    *
    * See [LibraryLoader] for terminology on URIs.
    */
-  Uri translateUri(Spannable node, Uri readableUri) {
+  Uri translateUri(leg.Spannable node, Uri readableUri) {
     switch (readableUri.scheme) {
       case 'package': return translatePackageUri(node, readableUri);
       default: return readableUri;
     }
   }
 
   Uri translateDartUri(elements.LibraryElement importingLibrary,
                        Uri resolvedUri, tree.Node node) {
     LibraryInfo libraryInfo = lookupLibraryInfo(resolvedUri.path);
     String path = lookupLibraryPath(libraryInfo);
     if (libraryInfo != null &&
         libraryInfo.category == "Internal") {
       bool allowInternalLibraryAccess = false;
       if (importingLibrary != null) {
         if (importingLibrary.isPlatformLibrary || importingLibrary.isPatch) {
           allowInternalLibraryAccess = true;
         } else if (importingLibrary.canonicalUri.path.contains(
                        'sdk/tests/compiler/dart2js_native')) {
           allowInternalLibraryAccess = true;
         }
       }
       if (!allowInternalLibraryAccess) {
         if (importingLibrary != null) {
           reportError(
               node,
-              MessageKind.INTERNAL_LIBRARY_FROM,
+              leg.MessageKind.INTERNAL_LIBRARY_FROM,
               {'resolvedUri': resolvedUri,
                'importingUri': importingLibrary.canonicalUri});
         } else {
           reportError(
               node,
-              MessageKind.INTERNAL_LIBRARY,
+              leg.MessageKind.INTERNAL_LIBRARY,
               {'resolvedUri': resolvedUri});
         }
       }
     }
     if (path == null) {
-      reportError(node, MessageKind.LIBRARY_NOT_FOUND,
+      reportError(node, leg.MessageKind.LIBRARY_NOT_FOUND,
                   {'resolvedUri': 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 libraryRoot.resolve(path);
   }
 
   Uri resolvePatchUri(String dartLibraryPath) {
     String patchPath = lookupPatchPath(dartLibraryPath);
     if (patchPath == null) return null;
     return libraryRoot.resolve(patchPath);
   }
 
-  Uri translatePackageUri(Spannable node, Uri uri) {
+  Uri translatePackageUri(leg.Spannable node, Uri uri) {
     try {
       checkValidPackageUri(uri);
     } on ArgumentError catch (e) {
       reportError(
           node,
-          MessageKind.INVALID_PACKAGE_URI,
+          leg.MessageKind.INVALID_PACKAGE_URI,
           {'uri': uri, 'exception': e.message});
       return null;
     }
     return packages.resolve(uri,
         notFound: (Uri notFound) {
           reportError(
               node,
-              MessageKind.LIBRARY_NOT_FOUND,
+              leg.MessageKind.LIBRARY_NOT_FOUND,
               {'resolvedUri': uri}
           );
           return null;
         });
   }
 
   Future setupPackages(Uri uri) {
     if (packageRoot != null) {
       // Use "non-file" packages because the file version requires a [Directory]
       // and we can't depend on 'dart:io' classes.
@@ skipping 34 matching lines @@
           }
         }
         int total = totalCompileTime.elapsedMilliseconds;
         log('Total compile-time ${total}msec;'
             ' unaccounted ${total - cumulated}msec');
         return success;
       });
     });
   }
 
-  void reportDiagnostic(Spannable node,
-                        Message message,
+  void reportDiagnostic(leg.Spannable node,
+                        leg.Message message,
                         api.Diagnostic kind) {
     leg.SourceSpan span = spanFromSpannable(node);
     if (identical(kind, api.Diagnostic.ERROR)
         || identical(kind, api.Diagnostic.CRASH)
         || (fatalWarnings && identical(kind, api.Diagnostic.WARNING))) {
       compilationFailed = true;
     }
     // [:span.uri:] might be [:null:] in case of a [Script] with no [uri]. For
     // instance in the [Types] constructor in typechecker.dart.
     if (span == null || span.uri == null) {
       callUserHandler(message, null, null, null, '$message', kind);
     } else {
       callUserHandler(
           message, span.uri, span.begin, span.end, '$message', kind);
     }
   }
 
   bool get isMockCompilation {
     return mockableLibraryUsed
       && (options.indexOf('--allow-mock-compilation') != -1);
   }
 
-  void callUserHandler(Message message, Uri uri, int begin, int end,
+  void callUserHandler(leg.Message message, Uri uri, int begin, int end,
                        String text, api.Diagnostic kind) {
     try {
       userHandlerTask.measure(() {
         handler.report(message, uri, begin, end, text, kind);
       });
     } catch (ex, s) {
       diagnoseCrashInUserCode(
           'Uncaught exception in diagnostic handler', ex, s);
       rethrow;
     }
@@ skipping 23 matching lines @@
     print('$message: ${tryToString(exception)}');
     print(tryToString(stackTrace));
   }
 
   fromEnvironment(String name) => environment[name];
 
   LibraryInfo lookupLibraryInfo(String libraryName) {
     return library_info.LIBRARIES[libraryName];
   }
 }