Refactor ConstantExpression/ConstantConstructor to use entities.

tests/compiler/dart2js/constant_expression_test.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 constant_expression_test;
 
 import 'dart:async';
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
 import 'package:compiler/src/constants/expressions.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/elements/elements.dart';
 import 'memory_compiler.dart';
+import 'constant_expression_evaluate_test.dart' show MemoryEnvironment;
 
 class TestData {
   /// Declarations needed for the [constants].
   final String declarations;
 
   /// Tested constants.
   final List constants;
 
   const TestData(this.declarations, this.constants);
 }
@@ skipping 32 matching lines @@
     const ConstantData('1 == 2', ConstantExpressionKind.BINARY),
     const ConstantData('1 != 2', ConstantExpressionKind.BINARY),
     const ConstantData('1 ?? 2', ConstantExpressionKind.BINARY),
     const ConstantData('-(1)', ConstantExpressionKind.UNARY, text: '-1'),
     const ConstantData('"foo".length', ConstantExpressionKind.STRING_LENGTH),
     const ConstantData('identical(0, 1)', ConstantExpressionKind.IDENTICAL),
     const ConstantData('"a" "b"', ConstantExpressionKind.CONCATENATE,
         text: '"ab"'),
     const ConstantData('identical', ConstantExpressionKind.FUNCTION),
     const ConstantData('true ? 0 : 1', ConstantExpressionKind.CONDITIONAL),
-    const ConstantData('proxy', ConstantExpressionKind.VARIABLE),
+    const ConstantData('proxy', ConstantExpressionKind.FIELD),
     const ConstantData('Object', ConstantExpressionKind.TYPE),
     const ConstantData('#name', ConstantExpressionKind.SYMBOL),
     const ConstantData('const [0, 1]', ConstantExpressionKind.LIST),
     const ConstantData('const <int>[0, 1]', ConstantExpressionKind.LIST),
     const ConstantData('const {0: 1, 2: 3}', ConstantExpressionKind.MAP),
     const ConstantData(
         'const <int, int>{0: 1, 2: 3}', ConstantExpressionKind.MAP),
     const ConstantData('const bool.fromEnvironment("foo", defaultValue: false)',
         ConstantExpressionKind.BOOL_FROM_ENVIRONMENT),
     const ConstantData('const int.fromEnvironment("foo", defaultValue: 42)',
@@ skipping 124 matching lines @@
   data.constants.forEach((ConstantData constantData) {
     String name = 'c${constants.length}';
     sb.write('const $name = ${constantData.code};\n');
     constants[name] = constantData;
   });
   sb.write('main() {}\n');
   String source = sb.toString();
   CompilationResult result = await runCompiler(
       memorySourceFiles: {'main.dart': source}, options: ['--analyze-all']);
   Compiler compiler = result.compiler;
+  MemoryEnvironment environment = new MemoryEnvironment(compiler);
   var library = compiler.mainApp;
   constants.forEach((String name, ConstantData data) {
     FieldElement field = library.localLookup(name);
     var constant = field.constant;
     Expect.equals(
         data.kind,
         constant.kind,
         "Unexpected kind '${constant.kind}' for contant "
         "`${constant.toDartText()}`, expected '${data.kind}'.");
     Expect.equals(
         data.text,
         constant.toDartText(),
         "Unexpected text '${constant.toDartText()}' for contant, "
         "expected '${data.text}'.");
     if (data.type != null) {
-      String instanceType = constant.computeInstanceType().toString();
+      String instanceType =
+          constant.computeInstanceType(environment).toString();
       Expect.equals(
           data.type,
           instanceType,
           "Unexpected type '$instanceType' for contant "
           "`${constant.toDartText()}`, expected '${data.type}'.");
     }
     if (data.fields != null) {
-      Map instanceFields = constant.computeInstanceFields();
+      Map instanceFields = constant.computeInstanceFields(environment);
       Expect.equals(
           data.fields.length,
           instanceFields.length,
           "Unexpected field count ${instanceFields.length} for contant "
           "`${constant.toDartText()}`, expected '${data.fields.length}'.");
       instanceFields.forEach((field, expression) {
         String name = '$field';
         String expression = instanceFields[field].toDartText();
         String expected = data.fields[name];
         Expect.equals(
             expected,
             expression,
             "Unexpected field expression ${expression} for field '$name' in "
             "contant `${constant.toDartText()}`, expected '${expected}'.");
       });
     }
   });
 }