Rename Constant to ConstantValue and ConstExp to ConstantExpression.

sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.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.
 
 part of dart2js.js_emitter;
 
 const USE_NEW_EMITTER = const bool.fromEnvironment("dart2js.use.new.emitter");
 
 /**
  * Generates the code for all used classes in the program. Static fields (even
  * in classes) are ignored, since they can be treated as non-class elements.
  *
  * The code for the containing (used) methods must exist in the [:universe:].
  */
 class CodeEmitterTask extends CompilerTask {
   // TODO(floitsch): the code-emitter task should not need a namer.
   final Namer namer;
   final TypeTestEmitter typeTestEmitter = new TypeTestEmitter();
   NativeEmitter nativeEmitter;
   OldEmitter oldEmitter;
   Emitter emitter;
 
   final Set<ClassElement> neededClasses = new Set<ClassElement>();
   final Map<OutputUnit, List<ClassElement>> outputClassLists =
       new Map<OutputUnit, List<ClassElement>>();
-  final Map<OutputUnit, List<Constant>> outputConstantLists =
-      new Map<OutputUnit, List<Constant>>();
+  final Map<OutputUnit, List<ConstantValue>> outputConstantLists =
+      new Map<OutputUnit, List<ConstantValue>>();
   final List<ClassElement> nativeClasses = <ClassElement>[];
 
   /// Records if a type variable is read dynamically for type tests.
   final Set<TypeVariableElement> readTypeVariables =
       new Set<TypeVariableElement>();
 
   // TODO(ngeoffray): remove this field.
   Set<ClassElement> instantiatedClasses;
   List<TypedefElement> typedefsNeededForReflection;
 
@@ skipping 11 matching lines @@
     // TODO(18886): Remove this call (and the show in the import) once the
     // memory-leak in the VM is fixed.
     templateManager.clear();
   }
 
 
   jsAst.Expression generateEmbeddedGlobalAccess(String global) {
     return emitter.generateEmbeddedGlobalAccess(global);
   }
 
-  jsAst.Expression constantReference(Constant value) {
+  jsAst.Expression constantReference(ConstantValue value) {
     return emitter.constantReference(value);
   }
 
   Set<ClassElement> interceptorsReferencedFromConstants() {
     Set<ClassElement> classes = new Set<ClassElement>();
     JavaScriptConstantCompiler handler = backend.constants;
-    List<Constant> constants = handler.getConstantsForEmission();
-    for (Constant constant in constants) {
-      if (constant is InterceptorConstant) {
-        InterceptorConstant interceptorConstant = constant;
+    List<ConstantValue> constants = handler.getConstantsForEmission();
+    for (ConstantValue constant in constants) {
+      if (constant is InterceptorConstantValue) {
+        InterceptorConstantValue interceptorConstant = constant;
         classes.add(interceptorConstant.dispatchedType.element);
       }
     }
     return classes;
   }
 
   /**
    * Return a function that returns true if its argument is a class
    * that needs to be emitted.
    */
@@ skipping 34 matching lines @@
     unneededClasses.add(backend.jsPositiveIntClass);
 
     return (ClassElement cls) => !unneededClasses.contains(cls);
   }
 
   /**
    * Compute all the constants that must be emitted.
    */
   void computeNeededConstants() {
     JavaScriptConstantCompiler handler = backend.constants;
-    List<Constant> constants = handler.getConstantsForEmission(
+    List<ConstantValue> constants = handler.getConstantsForEmission(
         compiler.hasIncrementalSupport ? null : emitter.compareConstants);
-    for (Constant constant in constants) {
+    for (ConstantValue constant in constants) {
       if (emitter.isConstantInlinedOrAlreadyEmitted(constant)) continue;
       OutputUnit constantUnit =
           compiler.deferredLoadTask.outputUnitForConstant(constant);
       if (constantUnit == null) {
         // The back-end introduces some constants, like "InterceptorConstant" or
         // some list constants. They are emitted in the main output-unit.
         // TODO(sigurdm): We should track those constants.
         constantUnit = compiler.deferredLoadTask.mainOutputUnit;
       }
-      outputConstantLists.putIfAbsent(constantUnit, () => new List<Constant>())
+      outputConstantLists.putIfAbsent(constantUnit, () => new List<ConstantValue>())
           .add(constant);
     }
   }
 
   /// Compute all the classes and typedefs that must be emitted.
   void computeNeededDeclarations() {
     // Compute needed typedefs.
     typedefsNeededForReflection = Elements.sortedByPosition(
         compiler.world.allTypedefs
             .where(backend.isAccessibleByReflection)
@@ skipping 122 matching lines @@
 
   void registerReadTypeVariable(TypeVariableElement element) {
     readTypeVariables.add(element);
   }
 }
 
 abstract class Emitter {
   void emitProgram();
 
   jsAst.Expression generateEmbeddedGlobalAccess(String global);
-  jsAst.Expression constantReference(Constant value);
+  jsAst.Expression constantReference(ConstantValue value);
 
-  int compareConstants(Constant a, Constant b);
-  bool isConstantInlinedOrAlreadyEmitted(Constant constant);
+  int compareConstants(ConstantValue a, ConstantValue b);
+  bool isConstantInlinedOrAlreadyEmitted(ConstantValue constant);
 
   void invalidateCaches();
 }