Merge CoreTypes and CoreClasses into CommonElements.

tests/compiler/dart2js/related_types.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.
 
 library related_types;
 
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/core_types.dart';
 import 'package:compiler/src/dart_types.dart';
@@ skipping 61 matching lines @@
 class RelatedTypesChecker extends TraversalVisitor<DartType, dynamic> {
   final Compiler compiler;
   final ResolvedAst resolvedAst;
 
   RelatedTypesChecker(this.compiler, ResolvedAst resolvedAst)
       : this.resolvedAst = resolvedAst,
         super(resolvedAst.elements);
 
   ClosedWorld get world => compiler.resolverWorld.closedWorldForTesting;
 
-  CoreClasses get coreClasses => compiler.coreClasses;
-
-  CoreTypes get coreTypes => compiler.coreTypes;
+  CommonElements get commonElements => compiler.commonElements;
 
   DiagnosticReporter get reporter => compiler.reporter;
 
   InterfaceType get thisType => resolvedAst.element.enclosingClass.thisType;
 
   /// Returns `true` if there exists no common subtype of [left] and [right].
   bool hasEmptyIntersection(DartType left, DartType right) {
     if (left == right) return false;
     if (left == null || right == null) return false;
     ClassElement leftClass = const ClassFinder().findClass(left);
@@ skipping 63 matching lines @@
   InterfaceType findClassType(DartType receiver, ClassElement cls) {
     InterfaceType interfaceType = findInterfaceType(receiver);
     if (interfaceType == null) return null;
     InterfaceType mapType = interfaceType.asInstanceOf(cls);
     if (mapType == null) return null;
     return mapType;
   }
 
   /// Returns the supertype of [receiver] that implements `Iterable`, if any.
   InterfaceType findIterableType(DartType receiver) {
-    return findClassType(receiver, coreClasses.iterableClass);
+    return findClassType(receiver, commonElements.iterableClass);
   }
 
   /// Returns the element type of the supertype of [receiver] that implements
   /// `Iterable`, if any.
   DartType findIterableElementType(InterfaceType iterableType) {
     if (iterableType == null) return null;
     return iterableType.typeArguments[0];
   }
 
   /// Returns the supertype of [receiver] that implements `Map`, if any.
   InterfaceType findMapType(DartType receiver) {
-    return findClassType(receiver, coreClasses.mapClass);
+    return findClassType(receiver, commonElements.mapClass);
   }
 
   /// Returns the key type of the supertype of [receiver] that implements
   /// `Map`, if any.
   DartType findMapKeyType(InterfaceType mapType) {
     if (mapType == null) return null;
     return mapType.typeArguments[0];
   }
 
   /// Returns the value type of the supertype of [receiver] that implements
   /// `Map`, if any.
   DartType findMapValueType(InterfaceType mapType) {
     if (mapType == null) return null;
     return mapType.typeArguments[1];
   }
 
   /// Returns the supertype of [receiver] that implements `List`, if any.
   InterfaceType findListType(DartType receiver) {
-    return findClassType(receiver, coreClasses.listClass);
+    return findClassType(receiver, commonElements.listClass);
   }
 
   /// Returns the element type of the supertype of [receiver] that implements
   /// `List`, if any.
   DartType findListElementType(InterfaceType listType) {
     if (listType == null) return null;
     return listType.typeArguments[0];
   }
 
   /// Returns the implied return type of [type] or `dynamic` if no return type
@@ skipping 43 matching lines @@
       type = const DynamicType();
     }
     return type;
   }
 
   @override
   DartType visitEquals(Send node, Node left, Node right, _) {
     DartType leftType = apply(left);
     DartType rightType = apply(right);
     checkRelated(node, leftType, rightType);
-    return coreTypes.boolType;
+    return commonElements.boolType;
   }
 
   @override
   DartType visitNotEquals(Send node, Node left, Node right, _) {
     DartType leftType = apply(left);
     DartType rightType = apply(right);
     checkRelated(node, leftType, rightType);
-    return coreTypes.boolType;
+    return commonElements.boolType;
   }
 
   @override
   DartType visitIndex(Send node, Node receiver, Node index, _) {
     DartType receiverType = apply(receiver);
     DartType indexType = apply(index);
     InterfaceType mapType = findMapType(receiverType);
     DartType keyType = findMapKeyType(mapType);
     DartType valueType = findMapValueType(mapType);
     checkRelated(index, keyType, indexType);
     return valueType;
   }
 
   @override
   DartType visitLiteralInt(LiteralInt node) {
-    return coreTypes.intType;
+    return commonElements.intType;
   }
 
   @override
   DartType visitLiteralString(LiteralString node) {
-    return coreTypes.stringType;
+    return commonElements.stringType;
   }
 
   @override
   DartType visitLiteralBool(LiteralBool node) {
-    return coreTypes.boolType;
+    return commonElements.boolType;
   }
 
   @override
   DartType visitLiteralMap(LiteralMap node) {
     return elements.getType(node);
   }
 
   @override
   DartType visitLiteralList(LiteralList node) {
     return elements.getType(node);
@@ skipping 103 matching lines @@
   ClassElement findClass(DartType type) => type.accept(this, null);
 
   @override
   ClassElement visitType(DartType type, _) => null;
 
   @override
   ClassElement visitInterfaceType(InterfaceType type, _) {
     return type.element;
   }
 }