Rename Constant to ConstantValue and ConstExp to ConstantExpression.

tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart

 // Copyright (c) 2014, 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.
 
 // SExpressionUnstringifier implements the inverse operation to
 // [SExpressionStringifier].
 
 library sexpr_unstringifier;
 
-import 'package:compiler/implementation/constants/values.dart' as values
-    show Constant, IntConstant, NullConstant, StringConstant,
-         DoubleConstant, TrueConstant, FalseConstant;
+import 'package:compiler/implementation/constants/expressions.dart'
+    show PrimitiveConstantExpression;
+import 'package:compiler/implementation/constants/values.dart';
 import 'package:compiler/implementation/dart2jslib.dart' as dart2js
     show MessageKind;
 import 'package:compiler/implementation/dart_types.dart' as dart_types
     show DartType;
 import 'package:compiler/implementation/elements/elements.dart'
    show Entity, Element, Elements, Local, TypeVariableElement, ErroneousElement,
          TypeDeclarationElement, ExecutableElement;
 import 'package:compiler/implementation/elements/modelx.dart'
     show ErroneousElementX, TypeVariableElementX;
 import 'package:compiler/implementation/tree/tree.dart' show LiteralDartString;
 import 'package:compiler/implementation/universe/universe.dart'
     show Selector, SelectorKind;
 import 'package:compiler/implementation/cps_ir/cps_ir_nodes.dart';
-import 'package:compiler/implementation/constants/expressions.dart'
-    show PrimitiveConstExp;
 
 /// Used whenever a node constructed by [SExpressionUnstringifier] needs a
 /// named entity.
 class DummyEntity extends Entity {
   final String name;
   DummyEntity(this.name);
 }
 
 /// Used whenever a node constructed by [SExpressionUnstringifier] needs a
 /// local.
@@ skipping 513 matching lines @@
   }
 
   /// (Constant (constant))
   Constant parseConstant() {
     tokens.consumeStart(CONSTANT);
     String tag = tokens.read();
 
     // NullConstant.
     if (tag == "NullConstant") {
       tokens.consumeEnd();
-      return new Constant(new PrimitiveConstExp(new values.NullConstant()));
+      return new Constant(
+          new PrimitiveConstantExpression(new NullConstantValue()));
     }
 
     // BoolConstant.
     if (tag == "BoolConstant") {
       tokens.consumeStart();
       tag = tokens.read();
       tokens.consumeEnd();
       tokens.consumeEnd();
       if (tag == "true") {
-        return new Constant(new PrimitiveConstExp(
-            new values.TrueConstant()));
+        return new Constant(new PrimitiveConstantExpression(
+            new TrueConstantValue()));
       } else if (tag == "false") {
-        return new Constant(new PrimitiveConstExp(
-            new values.FalseConstant()));
+        return new Constant(new PrimitiveConstantExpression(
+            new FalseConstantValue()));
       }
       throw "Invalid bool value '$tag'.";
     }
 
     // StringConstant.
     if (tag == "StringConstant") {
       tokens.consumeStart();
       List<String> strings = <String>[];
       do {
         strings.add(tokens.read());
       } while (tokens.current != ")");
       tokens.consumeEnd();
 
       String string = strings.join(" ");
       assert(string.startsWith('"') && string.endsWith('"'));
 
-      values.StringConstant value = new values.StringConstant(
+      StringConstantValue value = new StringConstantValue(
           new LiteralDartString(string.substring(1, string.length - 1)));
 
       tokens.consumeEnd();
-      return new Constant(new PrimitiveConstExp(value));
+      return new Constant(new PrimitiveConstantExpression(value));
     }
 
     // IntConstant.
     if (tag == "IntConstant") {
       tokens.consumeStart();
       tag = tokens.read();
       int intValue = int.parse(tag, onError: (_) => null);
       if (intValue == null) {
         throw "Invalid int value '$tag'.";
       }
       tokens.consumeEnd();
       tokens.consumeEnd();
-      return new Constant(new PrimitiveConstExp(
-          new values.IntConstant(intValue)));
+      return new Constant(new PrimitiveConstantExpression(
+          new IntConstantValue(intValue)));
     }
 
     // DoubleConstant.
     if (tag == "DoubleConstant") {
       tokens.consumeStart();
       tag = tokens.read();
       double doubleValue = double.parse(tag, (_) => null);
       if (doubleValue == null) {
         throw "Invalid double value '$tag'.";
       }
       tokens.consumeEnd();
       tokens.consumeEnd();
-      return new Constant(new PrimitiveConstExp(
-          new values.DoubleConstant(doubleValue)));
+      return new Constant(new PrimitiveConstantExpression(
+          new DoubleConstantValue(doubleValue)));
     }
 
     throw "Unhandled tag '$tag'.";
   }
 
   /// (CreateFunction (definition))
   CreateFunction parseCreateFunction() {
     tokens.consumeStart(CREATE_FUNCTION);
     FunctionDefinition def = parseFunctionDefinition();
     tokens.consumeEnd();
@@ skipping 39 matching lines @@
     return new ReifyTypeVar(type);
   }
 
   /// (This)
   This parseThis() {
     tokens.consumeStart(THIS);
     tokens.consumeEnd();
     return new This();
   }
 }