Merge CoreTypes and CoreClasses into CommonElements.

pkg/compiler/lib/src/resolution/resolution.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.resolution;
 
 import 'dart:collection' show Queue;
 
 import '../common.dart';
 import '../common/names.dart' show Identifiers;
 import '../common/resolution.dart'
     show ParsingContext, Resolution, ResolutionImpact, Target;
 import '../common/tasks.dart' show CompilerTask, Measurer;
 import '../compile_time_constants.dart' show ConstantCompiler;
 import '../constants/expressions.dart'
     show
         ConstantExpression,
         ConstantExpressionKind,
         ConstructedConstantExpression,
         ErroneousConstantExpression;
 import '../constants/values.dart' show ConstantValue;
-import '../core_types.dart' show CoreClasses, CoreTypes, CommonElements;
+import '../core_types.dart' show CommonElements;
 import '../dart_types.dart';
 import '../elements/elements.dart';
 import '../elements/modelx.dart'
     show
         BaseClassElementX,
         BaseFunctionElementX,
         ConstructorElementX,
         FieldElementX,
         FunctionElementX,
         GetterElementX,
@@ skipping 32 matching lines @@
   final ConstantCompiler constantCompiler;
   final Resolution resolution;
 
   ResolverTask(this.resolution, this.constantCompiler, Measurer measurer)
       : super(measurer);
 
   String get name => 'Resolver';
 
   DiagnosticReporter get reporter => resolution.reporter;
   Target get target => resolution.target;
-  CoreTypes get coreTypes => resolution.coreTypes;
-  CoreClasses get coreClasses => resolution.coreClasses;
   CommonElements get commonElements => resolution.commonElements;
   ParsingContext get parsingContext => resolution.parsingContext;
   CompilerOptions get options => resolution.options;
   ResolutionEnqueuer get enqueuer => resolution.enqueuer;
   OpenWorld get world => enqueuer.universe;
 
   ResolutionImpact resolve(Element element) {
     return measure(() {
       if (Elements.isMalformed(element)) {
         // TODO(johnniwinther): Add a predicate for this.
@@ skipping 52 matching lines @@
         return;
       }
       seen.add(redirection);
       redirection = resolver.visitor.resolveConstructorRedirection(redirection);
     }
   }
 
   static void processAsyncMarker(Resolution resolution,
       BaseFunctionElementX element, ResolutionRegistry registry) {
     DiagnosticReporter reporter = resolution.reporter;
-    CoreClasses coreClasses = resolution.coreClasses;
+    CommonElements commonElements = resolution.commonElements;
     FunctionExpression functionExpression = element.node;
     AsyncModifier asyncModifier = functionExpression.asyncModifier;
     if (asyncModifier != null) {
       if (!resolution.target.supportsAsyncAwait) {
         reporter.reportErrorMessage(functionExpression.asyncModifier,
             MessageKind.ASYNC_AWAIT_NOT_SUPPORTED);
       } else {
         if (asyncModifier.isAsynchronous) {
           element.asyncMarker = asyncModifier.isYielding
               ? AsyncMarker.ASYNC_STAR
@@ skipping 22 matching lines @@
               element.asyncMarker.isYielding) {
             reporter.reportErrorMessage(
                 asyncModifier,
                 MessageKind.YIELDING_MODIFIER_ON_ARROW_BODY,
                 {'modifier': element.asyncMarker});
           }
         }
         switch (element.asyncMarker) {
           case AsyncMarker.ASYNC:
             registry.registerFeature(Feature.ASYNC);
-            coreClasses.futureClass.ensureResolved(resolution);
+            commonElements.futureClass.ensureResolved(resolution);
             break;
           case AsyncMarker.ASYNC_STAR:
             registry.registerFeature(Feature.ASYNC_STAR);
-            coreClasses.streamClass.ensureResolved(resolution);
+            commonElements.streamClass.ensureResolved(resolution);
             break;
           case AsyncMarker.SYNC_STAR:
             registry.registerFeature(Feature.SYNC_STAR);
-            coreClasses.iterableClass.ensureResolved(resolution);
+            commonElements.iterableClass.ensureResolved(resolution);
             break;
         }
       }
     }
   }
 
   bool _isNativeClassOrExtendsNativeClass(ClassElement classElement) {
     assert(classElement != null);
     while (classElement != null) {
       if (target.isNative(classElement)) return true;
@@ skipping 321 matching lines @@
    * called by [resolveClass] and [ClassSupertypeResolver].
    */
   void loadSupertypes(BaseClassElementX cls, Spannable from) {
     measure(() {
       if (cls.supertypeLoadState == STATE_DONE) return;
       if (cls.supertypeLoadState == STATE_STARTED) {
         reporter.reportErrorMessage(
             from, MessageKind.CYCLIC_CLASS_HIERARCHY, {'className': cls.name});
         cls.supertypeLoadState = STATE_DONE;
         cls.hasIncompleteHierarchy = true;
-        cls.allSupertypesAndSelf = coreClasses.objectClass.allSupertypesAndSelf
+        cls.allSupertypesAndSelf = commonElements
+            .objectClass.allSupertypesAndSelf
             .extendClass(cls.computeType(resolution));
         cls.supertype = cls.allSupertypes.head;
         assert(invariant(from, cls.supertype != null,
             message: 'Missing supertype on cyclic class $cls.'));
         cls.interfaces = const Link<DartType>();
         return;
       }
       cls.supertypeLoadState = STATE_STARTED;
       reporter.withCurrentElement(cls, () {
         // TODO(ahe): Cache the node in cls.
@@ skipping 582 matching lines @@
   TreeElements get treeElements {
     assert(invariant(this, _treeElements != null,
         message: "TreeElements have not been computed for $this."));
     return _treeElements;
   }
 
   void reuseElement() {
     _treeElements = null;
   }
 }