Remove Compiler.commonElements

pkg/compiler/lib/src/compile_time_constants.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.compile_time_constant_evaluator;
 
 import 'common/resolution.dart' show Resolution;
 import 'common/tasks.dart' show CompilerTask, Measurer;
 import 'common.dart';
 import 'compiler.dart' show Compiler;
@@ skipping 143 matching lines @@
   /** The set of variable elements that are in the process of being computed. */
   final Set<VariableElement> pendingVariables = new Set<VariableElement>();
 
   final Map<ConstantExpression, ConstantValue> constantValueMap =
       <ConstantExpression, ConstantValue>{};
 
   ConstantCompilerBase(this.compiler, this.constantSystem);
 
   DiagnosticReporter get reporter => compiler.reporter;
 
-  CommonElements get commonElements => compiler.commonElements;
+  CommonElements get commonElements => compiler.resolution.commonElements;
 
   @override
   @deprecated
   ConstantValue getConstantValueForVariable(VariableElement element) {
     ConstantExpression constant = initialVariableValues[element.declaration];
     // TODO(johnniwinther): Support eager evaluation of the constant.
     return constant != null ? getConstantValue(constant) : null;
   }
 
   ConstantExpression compileConstant(VariableElement element) {
@@ skipping 224 matching lines @@
   final Compiler compiler;
 
   Element get context => elements.analyzedElement;
 
   CompileTimeConstantEvaluator(this.handler, this.elements, this.compiler,
       {bool isConst: false})
       : this.isEvaluatingConstant = isConst;
 
   ConstantSystem get constantSystem => handler.constantSystem;
   Resolution get resolution => compiler.resolution;
-  CommonElements get commonElements => compiler.commonElements;
+  CommonElements get commonElements => resolution.commonElements;
   DiagnosticReporter get reporter => compiler.reporter;
 
   AstConstant evaluate(Node node) {
     // TODO(johnniwinther): should there be a visitErrorNode?
     if (node is ErrorNode) return new ErroneousAstConstant(context, node);
     AstConstant result = node.accept(this);
     assert(!isEvaluatingConstant || result != null,
         failedAt(node, "No AstConstant computed for the node."));
     return result;
   }
@@ skipping 86 matching lines @@
       keyExpressions.add(key.expression);
       valueExpressions.add(value.expression);
       map[key.value] = value.value;
     }
     ResolutionInterfaceType type = elements.getType(node);
     return new AstConstant(
         context,
         node,
         new MapConstantExpression(type, keyExpressions, valueExpressions),
         constantSystem.createMap(
-            compiler.commonElements, type, keyValues, map.values.toList()));
+            resolution.commonElements, type, keyValues, map.values.toList()));
   }
 
   AstConstant visitLiteralNull(LiteralNull node) {
     return new AstConstant(context, node, new NullConstantExpression(),
         constantSystem.createNull());
   }
 
   AstConstant visitLiteralString(LiteralString node) {
     String text = node.dartString.slowToString();
     return new AstConstant(context, node, new StringConstantExpression(text),
@@ skipping 58 matching lines @@
   }
 
   AstConstant visitLiteralSymbol(LiteralSymbol node) {
     ResolutionInterfaceType type = commonElements.symbolImplementationType;
     String text = node.slowNameString;
     List<AstConstant> arguments = <AstConstant>[
       new AstConstant(context, node, new StringConstantExpression(text),
           constantSystem.createString(text))
     ];
     ConstructorElement constructor =
-        compiler.commonElements.symbolConstructorTarget;
+        resolution.commonElements.symbolConstructorTarget;
     AstConstant constant = createConstructorInvocation(
         node, type, constructor, CallStructure.ONE_ARG,
         normalizedArguments: arguments);
     return new AstConstant(
         context, node, new SymbolConstantExpression(text), constant.value);
   }
 
   ConstantValue makeTypeConstant(ResolutionDartType elementType) {
-    return constantSystem.createType(compiler.commonElements, elementType);
+    return constantSystem.createType(resolution.commonElements, elementType);
   }
 
   /// Returns true if the prefix of the send resolves to a deferred import
   /// prefix.
   bool isDeferredUse(Send send) {
     if (send == null) return false;
     return compiler.deferredLoadTask.deferredPrefixElement(send, elements) !=
         null;
   }
 
@@ skipping 85 matching lines @@
         result = new AstConstant(
             context,
             send,
             new DeferredConstantExpression(result.expression, prefix),
             new DeferredConstantValue(result.value, prefix));
         compiler.deferredLoadTask
             .registerConstantDeferredUse(result.value, prefix);
       }
       return result;
     } else if (send.isCall) {
-      if (element == compiler.commonElements.identicalFunction &&
+      if (element == resolution.commonElements.identicalFunction &&
           send.argumentCount() == 2) {
         AstConstant left = evaluate(send.argumentsNode.nodes.head);
         AstConstant right = evaluate(send.argumentsNode.nodes.tail.head);
         if (left == null || right == null) {
           return null;
         }
         ConstantValue result =
             constantSystem.identity.fold(left.value, right.value);
         if (result != null) {
           return new AstConstant(
@@ skipping 722 matching lines @@
             new ErroneousConstantExpression(),
             new NullConstantValue());
 }
 
 class _CompilerEnvironment implements EvaluationEnvironment {
   final Compiler _compiler;
 
   _CompilerEnvironment(this._compiler);
 
   @override
-  CommonElements get commonElements => _compiler.commonElements;
+  CommonElements get commonElements => _compiler.resolution.commonElements;
 
   @override
   String readFromEnvironment(String name) {
     return _compiler.fromEnvironment(name);
   }
 
   @override
   ResolutionInterfaceType substByContext(
       ResolutionInterfaceType base, ResolutionInterfaceType target) {
     return base.substByContext(target);
   }
 
   @override
   ConstantConstructor getConstructorConstant(ConstructorElement constructor) {
     return constructor.constantConstructor;
   }
 
   @override
   ConstantExpression getFieldConstant(FieldElement field) {
     return field.constant;
   }
 
   @override
   ConstantExpression getLocalConstant(LocalVariableElement local) {
     return local.constant;
   }
 }