Refactor ConstantSystem

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/backend_api.dart' show BackendClasses;
 import 'common/resolution.dart' show Resolution;
 import 'common/tasks.dart' show CompilerTask, Measurer;
 import 'common.dart';
 import 'compiler.dart' show Compiler;
 import 'constant_system_dart.dart';
 import 'constants/constant_system.dart';
 import 'constants/constructors.dart';
 import 'constants/evaluation.dart';
 import 'constants/expressions.dart';
 import 'constants/values.dart';
@@ skipping 482 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, type, keyValues, map.values.toList()));
+            compiler.commonElements,
+            compiler.backend.backendClasses,
+            type,
+            keyValues,
+            map.values.toList()));
   }
 
   AstConstant visitLiteralNull(LiteralNull node) {
     return new AstConstant(context, node, new NullConstantExpression(),
         constantSystem.createNull());
   }
 
   AstConstant visitLiteralString(LiteralString node) {
     return new AstConstant(
         context,
@@ skipping 74 matching lines @@
     ];
     ConstructorElement constructor = compiler.commonElements.symbolConstructor;
     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, elementType);
+    return constantSystem.createType(
+        compiler.commonElements, compiler.backend.backendClasses, 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 820 matching lines @@
   ErroneousAstConstant(Element element, Node node)
       : super(
             element,
             node,
             // TODO(johnniwinther): Return a [NonConstantValue] instead.
             new ErroneousConstantExpression(),
             new NullConstantValue());
 }
 
 class _CompilerEnvironment implements Environment {
-  final Compiler compiler;
+  final Compiler _compiler;
 
-  _CompilerEnvironment(this.compiler);
+  _CompilerEnvironment(this._compiler);
+
+  @override
+  BackendClasses get backendClasses => _compiler.backend.backendClasses;
+
+  @override
+  CommonElements get commonElements => _compiler.commonElements;
 
   @override
   String readFromEnvironment(String name) {
-    return compiler.fromEnvironment(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;
   }
 }