Rename Constant to ConstantValue and ConstExp to ConstantExpression.

tests/compiler/dart2js/metadata_test.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.
 
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/implementation/constants/values.dart'
-    show PrimitiveConstant;
+    show PrimitiveConstantValue;
 import 'package:expect/expect.dart';
 import 'compiler_helper.dart';
 import 'parser_helper.dart';
 
 void checkPosition(Spannable spannable, Node node, String source, compiler) {
   SourceSpan span = compiler.spanFromSpannable(spannable);
   Expect.isTrue(span.begin < span.end,
                 'begin = ${span.begin}; end = ${span.end}');
   Expect.isTrue(span.end < source.length,
                 'end = ${span.end}; length = ${source.length}');
@@ skipping 11 matching lines @@
                    @native
                    $declaration
                    main() {}""";
 
   compileAndCheck(source1, name, (compiler, element) {
     compiler.enqueuer.resolution.queueIsClosed = false;
     Expect.equals(1, length(element.metadata),
         'Unexpected metadata count on $element.');
     PartialMetadataAnnotation annotation = element.metadata.head;
     annotation.ensureResolved(compiler);
-    PrimitiveConstant value = annotation.constant.value;
-    Expect.stringEquals('xyz', value.value.slowToString());
+    PrimitiveConstantValue value = annotation.constant.value;
+    Expect.stringEquals('xyz', value.primitiveValue.slowToString());
 
     checkPosition(annotation, annotation.cachedNode, source1, compiler);
   });
 
   // Ensure that each repeated annotation has a unique instance of
   // [MetadataAnnotation].
   var source2 = """const native = 'xyz';
                    @native @native
                    $declaration
                    main() {}""";
 
   compileAndCheck(source2, name, (compiler, element) {
     compiler.enqueuer.resolution.queueIsClosed = false;
     Expect.equals(2, length(element.metadata));
     PartialMetadataAnnotation annotation1 = element.metadata.head;
     PartialMetadataAnnotation annotation2 = element.metadata.tail.head;
     annotation1.ensureResolved(compiler);
     annotation2.ensureResolved(compiler);
     Expect.isFalse(identical(annotation1, annotation2),
                    'expected unique instances');
     Expect.notEquals(annotation1, annotation2, 'expected unequal instances');
-    PrimitiveConstant value1 = annotation1.constant.value;
-    PrimitiveConstant value2 = annotation2.constant.value;
+    PrimitiveConstantValue value1 = annotation1.constant.value;
+    PrimitiveConstantValue value2 = annotation2.constant.value;
     Expect.identical(value1, value2, 'expected same compile-time constant');
-    Expect.stringEquals('xyz', value1.value.slowToString());
-    Expect.stringEquals('xyz', value2.value.slowToString());
+    Expect.stringEquals('xyz', value1.primitiveValue.slowToString());
+    Expect.stringEquals('xyz', value2.primitiveValue.slowToString());
 
     checkPosition(annotation1, annotation1.cachedNode, source2, compiler);
     checkPosition(annotation2, annotation2.cachedNode, source2, compiler);
   });
 
   if (isTopLevelOnly) return;
 
   // Ensure that a compile-time constant can be resolved from an
   // annotation.
   var source3 = """const native = 'xyz';
                    class Foo {
                      @native
                      $declaration
                    }
                    main() {}""";
 
   compileAndCheck(source3, 'Foo', (compiler, element) {
     compiler.enqueuer.resolution.queueIsClosed = false;
     Expect.equals(0, length(element.metadata));
     element.ensureResolved(compiler);
     Expect.equals(0, length(element.metadata));
     element = element.lookupLocalMember(name);
     Expect.equals(1, length(element.metadata));
     PartialMetadataAnnotation annotation = element.metadata.head;
     annotation.ensureResolved(compiler);
-    PrimitiveConstant value = annotation.constant.value;
-    Expect.stringEquals('xyz', value.value.slowToString());
+    PrimitiveConstantValue value = annotation.constant.value;
+    Expect.stringEquals('xyz', value.primitiveValue.slowToString());
 
     checkPosition(annotation, annotation.cachedNode, source3, compiler);
   });
 
   // Ensure that each repeated annotation has a unique instance of
   // [MetadataAnnotation].
   var source4 = """const native = 'xyz';
                    class Foo {
                      @native @native
                      $declaration
                    }
                    main() {}""";
 
   compileAndCheck(source4, 'Foo', (compiler, element) {
     compiler.enqueuer.resolution.queueIsClosed = false;
     Expect.equals(0, length(element.metadata));
     element.ensureResolved(compiler);
     Expect.equals(0, length(element.metadata));
     element = element.lookupLocalMember(name);
     Expect.equals(2, length(element.metadata));
     PartialMetadataAnnotation annotation1 = element.metadata.head;
     PartialMetadataAnnotation annotation2 = element.metadata.tail.head;
     annotation1.ensureResolved(compiler);
     annotation2.ensureResolved(compiler);
     Expect.isFalse(identical(annotation1, annotation2),
                    'expected unique instances');
     Expect.notEquals(annotation1, annotation2, 'expected unequal instances');
-    PrimitiveConstant value1 = annotation1.constant.value;
-    PrimitiveConstant value2 = annotation2.constant.value;
+    PrimitiveConstantValue value1 = annotation1.constant.value;
+    PrimitiveConstantValue value2 = annotation2.constant.value;
     Expect.identical(value1, value2, 'expected same compile-time constant');
-    Expect.stringEquals('xyz', value1.value.slowToString());
-    Expect.stringEquals('xyz', value2.value.slowToString());
+    Expect.stringEquals('xyz', value1.primitiveValue.slowToString());
+    Expect.stringEquals('xyz', value2.primitiveValue.slowToString());
 
     checkPosition(annotation1, annotation1.cachedNode, source4, compiler);
     checkPosition(annotation1, annotation2.cachedNode, source4, compiler);
   });
 }
 
 void testClassMetadata() {
   checkAnnotation('Foo', 'class Foo {}', isTopLevelOnly: true);
 }
 
@@ skipping 28 matching lines @@
     asyncTest(() => compiler.runCompiler(uri).then((_) {
       compiler.enqueuer.resolution.queueIsClosed = false;
       LibraryElement element = compiler.libraryLoader.lookupLibrary(uri);
       Expect.isNotNull(element, 'Cannot find $uri');
 
       Link<MetadataAnnotation> metadata = extractMetadata(element);
       Expect.equals(1, length(metadata));
 
       PartialMetadataAnnotation annotation = metadata.head;
       annotation.ensureResolved(compiler);
-      PrimitiveConstant value = annotation.constant.value;
-      Expect.stringEquals('xyz', value.value.slowToString());
+      PrimitiveConstantValue value = annotation.constant.value;
+      Expect.stringEquals('xyz', value.primitiveValue.slowToString());
 
       checkPosition(annotation, annotation.cachedNode, source, compiler);
     }));
   }
 
   var source;
 
   source = """@native
               library foo;
               const native = 'xyz';
@@ skipping 25 matching lines @@
   compileAndCheckLibrary(source,
                          (e) => e.compilationUnits.first.partTag.metadata);
 }
 
 void main() {
   testClassMetadata();
   testTopLevelMethodMetadata();
   testTopLevelFieldMetadata();
   testLibraryTags();
 }