Remove Compiler.commonElements

pkg/compiler/lib/src/deferred_load.dart

 // Copyright (c) 2014, 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 deferred_load;
 
 import 'common/tasks.dart' show CompilerTask;
 import 'common.dart';
 import 'compiler.dart' show Compiler;
 import 'constants/expressions.dart' show ConstantExpression;
@@ skipping 75 matching lines @@
 
 /// For each deferred import, find elements and constants to be loaded when that
 /// import is loaded. Elements that are used by several deferred imports are in
 /// shared OutputUnits.
 class DeferredLoadTask extends CompilerTask {
   /// The name of this task.
   String get name => 'Deferred Loading';
 
   /// DeferredLibrary from dart:async
   ClassElement get deferredLibraryClass =>
-      compiler.commonElements.deferredLibraryClass;
+      compiler.resolution.commonElements.deferredLibraryClass;
 
   /// A synthetic import representing the loading of the main program.
   final _DeferredImport _fakeMainImport = const _DeferredImport();
 
   /// The OutputUnit that will be loaded when the program starts.
   final OutputUnit mainOutputUnit = new OutputUnit(isMainOutput: true);
 
   /// A set containing (eventually) all output units that will result from the
   /// program.
   final Set<OutputUnit> allOutputUnits = new Set<OutputUnit>();
@@ skipping 391 matching lines @@
         }
       }
 
       iterateTags(library);
       if (library.isPatched) {
         iterateTags(library.implementation);
       }
     }
 
     traverseLibrary(root);
-    result.add(compiler.commonElements.coreLibrary);
+    result.add(compiler.resolution.commonElements.coreLibrary);
     return result;
   }
 
   /// Add all dependencies of [constant] to the mapping of [import].
   void _mapConstantDependencies(
       ConstantValue constant, _DeferredImport import) {
     Set<ConstantValue> constants = _constantsDeferredBy.putIfAbsent(
         import, () => new Set<ConstantValue>());
     if (constants.contains(constant)) return;
     constants.add(constant);
@@ skipping 192 matching lines @@
                     element: element.implementation, import: _fakeMainImport);
               }
               for (ClassElement element
                   in closedWorld.backendUsage.globalClassDependencies) {
                 _mapDependencies(
                     element: element.implementation, import: _fakeMainImport);
               }
 
               // Now check to see if we have to add more elements due to
               // mirrors.
-              if (compiler.commonElements.mirrorsLibrary != null) {
+              if (compiler.resolution.commonElements.mirrorsLibrary != null) {
                 _addMirrorElements();
               }
 
               // Build the OutputUnits using these two maps.
               Map<Element, OutputUnit> elementToOutputUnitBuilder =
                   new Map<Element, OutputUnit>();
               Map<ConstantValue, OutputUnit> constantToOutputUnitBuilder =
                   new Map<ConstantValue, OutputUnit>();
 
               // Add all constants that may have been registered during
@@ skipping 92 matching lines @@
         // TODO(sigurdm): Make helper getLibraryImportTags when tags is a List
         // instead of a Link.
         for (ImportElement import in library.imports) {
           /// Give an error if the old annotation-based syntax has been used.
           List<MetadataAnnotation> metadataList = import.metadata;
           if (metadataList != null) {
             for (MetadataAnnotation metadata in metadataList) {
               metadata.ensureResolved(compiler.resolution);
               ConstantValue value =
                   compiler.constants.getConstantValue(metadata.constant);
-              ResolutionDartType type = value.getType(compiler.commonElements);
+              ResolutionDartType type =
+                  value.getType(compiler.resolution.commonElements);
               Element element = type.element;
               if (element == deferredLibraryClass) {
                 reporter.reportErrorMessage(
                     import, MessageKind.DEFERRED_OLD_SYNTAX);
               }
             }
           }
 
           String prefix = (import.prefix != null) ? import.prefix.name : null;
           // The last import we saw with the same prefix.
@@ skipping 229 matching lines @@
         result = '';
       }
     } else {
       // Finds the first argument to the [DeferredLibrary] annotation
       List<MetadataAnnotation> metadatas = declaration.metadata;
       assert(metadatas != null);
       for (MetadataAnnotation metadata in metadatas) {
         metadata.ensureResolved(compiler.resolution);
         ConstantValue value =
             compiler.constants.getConstantValue(metadata.constant);
-        ResolutionDartType type = value.getType(compiler.commonElements);
+        ResolutionDartType type =
+            value.getType(compiler.resolution.commonElements);
         Element element = type.element;
-        if (element == compiler.commonElements.deferredLibraryClass) {
+        if (element ==
+            compiler.resolution.commonElements.deferredLibraryClass) {
           ConstructedConstantValue constant = value;
           StringConstantValue s = constant.fields.values.single;
           result = s.primitiveValue;
           break;
         }
       }
     }
     assert(result != null);
     return result;
   }
 
   bool operator ==(other) {
     if (other is! _DeclaredDeferredImport) return false;
     return declaration == other.declaration;
   }
 
   int get hashCode => declaration.hashCode * 17;
 
   String toString() => '$declaration';
 }