Rename KernelWorldBuilder to KernelElementBuilder

pkg/compiler/lib/src/library_loader.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 dart2js.library_loader;
 
 import 'dart:async';
 
 import 'common/names.dart' show Uris;
 import 'common/tasks.dart' show CompilerTask, Measurer;
@@ skipping 12 matching lines @@
         DeferredLoaderGetterElementX,
         ErroneousElementX,
         ExportElementX,
         ImportElementX,
         LibraryElementX,
         LibraryDependencyElementX,
         PrefixElementX,
         SyntheticImportElement;
 import 'enqueue.dart' show DeferredAction;
 import 'environment.dart';
-import 'kernel/world_builder.dart' show KernelWorldBuilder;
+import 'kernel/element_map.dart' show KernelToElementMap;
 import 'patch_parser.dart' show PatchParserTask;
 import 'resolved_uri_translator.dart';
 import 'script.dart';
 import 'serialization/serialization.dart' show LibraryDeserializer;
 import 'tree/tree.dart';
 import 'util/util.dart' show Link, LinkBuilder;
 
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/binary/ast_from_binary.dart' show BinaryBuilder;
 
@@ skipping 793 matching lines @@
   final DiagnosticReporter reporter;
 
   final ResolvedUriTranslator uriTranslator;
 
   /// Loads the contents of a script file (a .dart file). Used when loading
   /// libraries from source.
   final ScriptLoader scriptLoader;
 
   /// Holds the mapping of Kernel IR to KElements that is constructed as a
   /// result of loading a program.
-  KernelWorldBuilder _worldBuilder;
+  KernelToElementMap _elementMap;
 
   List<LibraryEntity> _allLoadedLibraries;
 
   _DillLibraryLoaderTask(
       this.uriTranslator, this.scriptLoader, this.reporter, Measurer measurer)
       : _allLoadedLibraries = new List<LibraryEntity>(),
         super(measurer);
 
   /// Loads an entire Kernel [Program] from a file on disk (note, not just a
   /// library, so this name is actually a bit of a misnomer).
   // TODO(efortuna): Rename this once the Element library loader class goes
   // away.
   Future<LoadedLibraries> loadLibrary(Uri resolvedUri,
       {bool skipFileWithPartOfTag: false}) {
     assert(resolvedUri.pathSegments.last.endsWith('.dill'));
     Uri readableUri = uriTranslator.translate(null, resolvedUri, null);
     return measure(() async {
       Script script = await scriptLoader.readScript(readableUri, null);
       ir.Program program = new ir.Program();
       // Hack because the existing file has a terminating 0 and the
       // BinaryBuilder doesn't expect that.
       var bytes = new List<int>.from(script.file.slowUtf8ZeroTerminatedBytes());
       bytes.removeLast();
       new BinaryBuilder(bytes).readProgram(program);
       return measure(() {
-        _worldBuilder = new KernelWorldBuilder(reporter, program);
+        _elementMap = new KernelToElementMap(reporter, program);
         program.libraries.forEach((ir.Library library) => _allLoadedLibraries
-            .add(_worldBuilder.lookupLibrary(library.importUri)));
+            .add(_elementMap.lookupLibrary(library.importUri)));
         LibraryEntity rootLibrary = null;
         if (program.mainMethod != null) {
-          rootLibrary = _worldBuilder
+          rootLibrary = _elementMap
               .lookupLibrary(program.mainMethod.enclosingLibrary.importUri);
         }
         return new _LoadedLibrariesAdapter(
-            rootLibrary, _allLoadedLibraries, _worldBuilder);
+            rootLibrary, _allLoadedLibraries, _elementMap);
       });
     });
   }
 
-  KernelWorldBuilder get worldBuilder => _worldBuilder;
+  KernelToElementMap get elementMap => _elementMap;
 
   void reset({bool reuseLibrary(LibraryElement library)}) {
     throw new UnimplementedError('_DillLibraryLoaderTask.reset');
   }
 
   Future resetAsync(Future<bool> reuseLibrary(LibraryElement library)) {
     throw new UnimplementedError('_DillLibraryLoaderTask.resetAsync');
   }
 
   Iterable<LibraryEntity> get libraries => _allLoadedLibraries;
 
   LibraryEntity lookupLibrary(Uri canonicalUri) {
-    return _worldBuilder?.lookupLibrary(canonicalUri);
+    return _elementMap?.lookupLibrary(canonicalUri);
   }
 
   Future<Null> resetLibraries(ReuseLibrariesFunction reuseLibraries) {
     throw new UnimplementedError('_DillLibraryLoaderTask.reuseLibraries');
   }
 
   void registerDeferredAction(DeferredAction action) {
     throw new UnimplementedError(
         '_DillLibraryLoaderTask.registerDeferredAction');
   }
@@ skipping 693 matching lines @@
   }
 
   String toString() => 'root=$rootLibrary,libraries=${_newLibraries}';
 }
 
 /// Adapter class to mimic the behavior of LoadedLibraries for Kernel element
 /// behavior. Ultimately we'll just access worldBuilder instead.
 class _LoadedLibrariesAdapter implements LoadedLibraries {
   final LibraryEntity rootLibrary;
   final List<LibraryEntity> _newLibraries;
-  final KernelWorldBuilder worldBuilder;
+  final KernelToElementMap worldBuilder;
 
   _LoadedLibrariesAdapter(
       this.rootLibrary, this._newLibraries, this.worldBuilder) {
     assert(rootLibrary != null);
   }
 
   bool containsLibrary(Uri uri) => getLibrary(uri) != null;
 
   LibraryEntity getLibrary(Uri uri) => worldBuilder.lookupLibrary(uri);
 
@@ skipping 53 matching lines @@
 }
 
 /// API used by the library loader to synchronously scan a library or
 /// compilation unit and ensure that their library tags are computed.
 abstract class ElementScanner {
   void scanLibrary(LibraryElement library);
   void scanUnit(CompilationUnitElement unit);
 }
 
 const _reuseLibrarySubtaskName = "Reuse library";