Merge WorldImpl with ResolutionWorldBuilderImpl

pkg/compiler/lib/src/enqueue.dart

Index: pkg/compiler/lib/src/enqueue.dart
diff --git a/pkg/compiler/lib/src/enqueue.dart b/pkg/compiler/lib/src/enqueue.dart
index b93812a9baaeeedb7ccb8b937fc375f27c96024f..3be3aeaf3ca9713a322f7615077054c6de26a91e 100644
--- a/pkg/compiler/lib/src/enqueue.dart
+++ b/pkg/compiler/lib/src/enqueue.dart
@@ -170,8 +170,6 @@ class ResolutionEnqueuer extends EnqueuerImpl {
 
   ResolutionWorldBuilder get universe => _universe;

[Siggi Cherem (dart-lang), 2016/12/20 15:42:33]

let's add a TODO: rename `universe` to `worldBuilder` ?

When doing so, consider getting rid of the getter too (since the underlying
_universe is final, we could use the public name for the field instead)

[Johnni Winther, 2016/12/21 08:52:28]

Added a TODO to [Enqueuer.universe].

_universe has type ResolutionWorldBuilderImpl and I want to have two levels of
visibility. For now it is a misuse of implementation details but the
internal/external interfaces will be cleaned up.

 
-  OpenWorld get _openWorld => universe.openWorld;
-
   bool get queueIsEmpty => _queue.isEmpty;
 
   DiagnosticReporter get _reporter => _resolution.reporter;
@@ -300,7 +298,7 @@ class ResolutionEnqueuer extends EnqueuerImpl {
         break;
       case TypeUseKind.TYPE_LITERAL:
         if (type.isTypedef) {
-          universe.openWorld.registerTypedef(type.element);
+          universe.registerTypedef(type.element);
         }
         break;
     }
@@ -386,7 +384,7 @@ class ResolutionEnqueuer extends EnqueuerImpl {
     }
 
     applyImpact(backend.registerUsedElement(element, forResolution: true));
-    _openWorld.registerUsedElement(element);
+    _universe.registerUsedElement(element);
 
     ResolutionWorkItem workItem = _resolution.createWorkItem(element);
     _queue.add(workItem);