Rename Enqueuer.universe to worldBuilder.

pkg/compiler/lib/src/compiler.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.compiler_base;
 
 import 'dart:async' show EventSink, Future;
 
 import '../compiler_new.dart' as api;
 import 'cache_strategy.dart' show CacheStrategy;
@@ skipping 287 matching lines @@
   /// Override this to mock resolution for testing.
   Resolution createResolution() => new CompilerResolution(this);
 
   /// Creates the resolver task.
   ///
   /// Override this to mock the resolver for testing.
   ResolverTask createResolverTask() {
     return new ResolverTask(resolution, backend.constantCompilerTask, measurer);
   }
 
-  // TODO(johnniwinther): Rename these appropriately when unification of worlds/
-  // universes is complete.
-  ResolutionWorldBuilder get resolverWorld => enqueuer.resolution.universe;
-  CodegenWorldBuilder get codegenWorld => enqueuer.codegen.universe;
+  ResolutionWorldBuilder get resolutionWorldBuilder =>
+      enqueuer.resolution.worldBuilder;
+  CodegenWorldBuilder get codegenWorldBuilder => enqueuer.codegen.worldBuilder;
 
   bool get analyzeAll => options.analyzeAll || compileAll;
 
   bool get compileAll => false;
 
   bool get disableTypeInference =>
       options.disableTypeInference || compilationFailed;
 
   // TODO(het): remove this from here. Either inline at all use sites or add it
   // to Reporter.
@@ skipping 380 matching lines @@
         globalInference.runGlobalTypeInference(
             mainFunction, closedWorld, closedWorldRefiner);
 
         if (stopAfterTypeInference) return;
 
         backend.onTypeInferenceComplete();
 
         reporter.log('Compiling...');
         phase = PHASE_COMPILING;
 
-        codegenWorld.open(closedWorld);
+        codegenWorldBuilder.open(closedWorld);
         enqueuer.codegen.applyImpact(backend.onCodegenStart(closedWorld));
         if (compileAll) {
           libraryLoader.libraries.forEach((LibraryElement library) {
             enqueuer.codegen.applyImpact(computeImpactForLibrary(library));
           });
         }
         processQueue(enqueuer.codegen, mainFunction,
             onProgress: showCodegenProgress);
         enqueuer.codegen.logSummary(reporter.log);
 
         int programSize = backend.assembleProgram(closedWorld);
 
         if (options.dumpInfo) {
           dumpInfoTask.reportSize(programSize);
           dumpInfoTask.dumpInfo(closedWorld);
         }
 
         backend.onCodegenEnd();
 
         checkQueues();
       });
 
   /// Perform the steps needed to fully end the resolution phase.
   ClosedWorldRefiner closeResolution() {
     phase = PHASE_DONE_RESOLVING;
 
-    ClosedWorldImpl world = resolverWorld.closeWorld(reporter);
+    ClosedWorldImpl world = resolutionWorldBuilder.closeWorld(reporter);
     // Compute whole-program-knowledge that the backend needs. (This might
     // require the information computed in [world.closeWorld].)
     backend.onResolutionComplete(world, world);
 
     deferredLoadTask.onResolutionComplete(mainFunction);
 
     // TODO(johnniwinther): Move this after rti computation but before
     // reflection members computation, and (re-)close the world afterwards.
     closureToClassMapper.createClosureClasses(world);
     return world;
@@ skipping 1210 matching lines @@
       _compiler.mirrorUsageAnalyzerTask;
 
   @override
   LibraryElement get coreLibrary => _compiler._commonElements.coreLibrary;
 
   @override
   bool get wasProxyConstantComputedTestingOnly => _proxyConstant != null;
 
   @override
   void registerClass(ClassElement cls) {
-    enqueuer.universe.registerClass(cls);
+    enqueuer.worldBuilder.registerClass(cls);
   }
 
   @override
   void resolveClass(ClassElement cls) {
     _compiler.resolver.resolveClass(cls);
   }
 
   @override
   void resolveTypedef(TypedefElement typdef) {
     _compiler.resolver.resolve(typdef);
@@ skipping 252 matching lines @@
   _ElementScanner(this.scanner);
   void scanLibrary(LibraryElement library) => scanner.scanLibrary(library);
   void scanUnit(CompilationUnitElement unit) => scanner.scan(unit);
 }
 
 class _EmptyEnvironment implements Environment {
   const _EmptyEnvironment();
 
   String valueOf(String key) => null;
 }