Pending renames and cleanups after commits

pkg/compiler/lib/src/js_backend/lookup_map_analysis.dart

 // Copyright (c) 2015, 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.
 
 /// Analysis to determine how to generate code for `LookupMap`s.
 library compiler.src.js_backend.lookup_map_analysis;
 
 import 'package:pub_semver/pub_semver.dart';
 
 import '../common.dart';
@@ skipping 19 matching lines @@
 import 'backend_helpers.dart';
 
 /// Lookup map handling for resolution.
 ///
 /// This analysis checks for the import of `package:lookup_map/lookup_map.dart`,
 /// and if found, read the `_version` variable from it.
 ///
 /// In [LookupMapAnalysis] the value of `_version` is checked to ensure that it
 /// is valid to perform the optimization of `LookupMap`. The actual optimization
 /// is performed by [LookupMapAnalysis].
-class LookupMapLibraryAccess {
+class LookupMapResolutionAnalysis {
   static final Uri PACKAGE_LOOKUP_MAP =
       new Uri(scheme: 'package', path: 'lookup_map/lookup_map.dart');
 
   /// Reference the diagnostic reporting system for logging and reporting issues
   /// to the end-user.
   final DiagnosticReporter _reporter;
 
   final ElementEnvironment _elementEnvironment;
 
   /// The resolved [FieldEntity] associated with the top-level `_version`.
   FieldEntity lookupMapVersionVariable;
 
   /// The resolved [LibraryEntity] associated with
   /// `package:lookup_map/lookup_map.dart`.
   LibraryEntity lookupMapLibrary;
 
   final StagedWorldImpactBuilder _impactBuilder =
       new StagedWorldImpactBuilder();
 
-  LookupMapLibraryAccess(this._reporter, this._elementEnvironment);
+  LookupMapResolutionAnalysis(this._reporter, this._elementEnvironment);
 
   /// Compute the [WorldImpact] for the constants registered since last flush.
   WorldImpact flush() {
     return _impactBuilder.flush();
   }
 
   /// Initializes this analysis by providing the resolved library. This is
   /// invoked during resolution when the `lookup_map` library is discovered.
   void init(LibraryEntity library) {
     lookupMapLibrary = library;
@@ skipping 53 matching lines @@
   const LookupMapAnalysis._();
 
   factory LookupMapAnalysis(
       DiagnosticReporter reporter,
       ConstantSystem constantSystem,
       ConstantEnvironment constants,
       ElementEnvironment elementEnvironment,
       CommonElements commonElements,
       BackendHelpers helpers,
       BackendClasses backendClasses,
-      LookupMapLibraryAccess analysis) {
+      LookupMapResolutionAnalysis analysis) {
     /// Checks if the version of lookup_map is valid, and if so, enable this
     /// analysis during codegen.
     FieldElement lookupMapVersionVariable = analysis.lookupMapVersionVariable;
     if (lookupMapVersionVariable == null) return const LookupMapAnalysis._();
 
     // At this point, the lookupMapVersionVariable should be resolved and it's
     // constant value should be available.
     StringConstantValue value =
         constants.getConstantValue(lookupMapVersionVariable.constant);
     if (value == null) {
@@ skipping 365 matching lines @@
         original.fields[analysis._valueField] = keyValuePairs[1];
       }
     } else {
       original.fields[analysis._entriesField] =
           new ListConstantValue(listType, keyValuePairs);
     }
   }
 }
 
 final _validLookupMapVersionConstraint = new VersionConstraint.parse('^0.0.1');