Revert "Move dart2jslib parts into separate libraries."

pkg/compiler/lib/src/apiimpl.dart

Index: pkg/compiler/lib/src/apiimpl.dart
diff --git a/pkg/compiler/lib/src/apiimpl.dart b/pkg/compiler/lib/src/apiimpl.dart
index 25cc70fed64702d3c62a7841cce8b53aaaffbac2..123938dbe1a418ee036a1d0a44637ab6501f77c8 100644
--- a/pkg/compiler/lib/src/apiimpl.dart
+++ b/pkg/compiler/lib/src/apiimpl.dart
@@ -7,24 +7,18 @@ 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');
@@ -219,9 +213,9 @@ class Compiler extends leg.Compiler {
   /**
    * 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).');
     }
@@ -234,13 +228,13 @@ class Compiler extends leg.Compiler {
       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});
         });
       }
@@ -251,7 +245,7 @@ class Compiler extends leg.Compiler {
     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);
@@ -275,16 +269,16 @@ class Compiler extends leg.Compiler {
       // 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,
@@ -297,7 +291,7 @@ class Compiler extends leg.Compiler {
    *
    * 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;
@@ -323,19 +317,19 @@ class Compiler extends leg.Compiler {
         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;
     }
@@ -354,13 +348,13 @@ class Compiler extends leg.Compiler {
     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;
     }
@@ -368,7 +362,7 @@ class Compiler extends leg.Compiler {
         notFound: (Uri notFound) {
           reportError(
               node,
-              MessageKind.LIBRARY_NOT_FOUND,
+              leg.MessageKind.LIBRARY_NOT_FOUND,
               {'resolvedUri': uri}
           );
           return null;
@@ -423,8 +417,8 @@ class Compiler extends leg.Compiler {
     });
   }
 
-  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)
@@ -447,7 +441,7 @@ class Compiler extends leg.Compiler {
       && (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(() {