Rename Constant to ConstantValue and ConstExp to ConstantExpression.

sdk/lib/_internal/compiler/implementation/js_backend/constant_handler_javascript.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.
 
 part of js_backend;
 
 /// [ConstantCompilerTask] for compilation of constants for the JavaScript
 /// backend.
 ///
 /// Since this task needs to distinguish between frontend and backend constants
 /// the actual compilation of the constants is forwarded to a
 /// [DartConstantCompiler] for the frontend interpretation of the constants and
 /// to a [JavaScriptConstantCompiler] for the backend interpretation.
 class JavaScriptConstantTask extends ConstantCompilerTask {
   DartConstantCompiler dartConstantCompiler;
   JavaScriptConstantCompiler jsConstantCompiler;
 
   JavaScriptConstantTask(Compiler compiler)
       : this.dartConstantCompiler = new DartConstantCompiler(compiler),
         this.jsConstantCompiler =
             new JavaScriptConstantCompiler(compiler),
         super(compiler);
 
   String get name => 'ConstantHandler';
 
-  ConstExp getConstantForVariable(VariableElement element) {
+  ConstantExpression getConstantForVariable(VariableElement element) {
     return dartConstantCompiler.getConstantForVariable(element);
   }
 
-  ConstExp compileConstant(VariableElement element) {
+  ConstantExpression compileConstant(VariableElement element) {
     return measure(() {
-      ConstExp result = dartConstantCompiler.compileConstant(element);
+      ConstantExpression result = dartConstantCompiler.compileConstant(element);
       jsConstantCompiler.compileConstant(element);
       return result;
     });
   }
 
   void compileVariable(VariableElement element) {
     measure(() {
       jsConstantCompiler.compileVariable(element);
     });
   }
 
-  ConstExp compileNode(Node node, TreeElements elements) {
+  ConstantExpression compileNode(Node node, TreeElements elements) {
     return measure(() {
-      ConstExp result =
+      ConstantExpression result =
           dartConstantCompiler.compileNode(node, elements);
       jsConstantCompiler.compileNode(node, elements);
       return result;
     });
   }
 
-  ConstExp compileMetadata(MetadataAnnotation metadata,
+  ConstantExpression compileMetadata(MetadataAnnotation metadata,
                            Node node,
                            TreeElements elements) {
     return measure(() {
-      ConstExp constant =
+      ConstantExpression constant =
           dartConstantCompiler.compileMetadata(metadata, node, elements);
       jsConstantCompiler.compileMetadata(metadata, node, elements);
       return constant;
     });
   }
 }
 
 /**
  * The [JavaScriptConstantCompiler] is used to keep track of compile-time
  * constants, initializations of global and static fields, and default values of
  * optional parameters for the JavaScript interpretation of constants.
  */
 class JavaScriptConstantCompiler extends ConstantCompilerBase
     implements BackendConstantEnvironment {
 
   /** Set of all registered compiled constants. */
-  final Set<Constant> compiledConstants = new Set<Constant>();
+  final Set<ConstantValue> compiledConstants = new Set<ConstantValue>();
 
   // TODO(johnniwinther): Move this to the backend constant handler.
   /** Caches the statics where the initial value cannot be eagerly compiled. */
   final Set<VariableElement> lazyStatics = new Set<VariableElement>();
 
   // Constants computed for constant expressions.
-  final Map<Node, ConstExp> nodeConstantMap = new Map<Node, ConstExp>();
+  final Map<Node, ConstantExpression> nodeConstantMap =
+      new Map<Node, ConstantExpression>();
 
   // Constants computed for metadata.
-  final Map<MetadataAnnotation, ConstExp> metadataConstantMap =
-      new Map<MetadataAnnotation, ConstExp>();
+  final Map<MetadataAnnotation, ConstantExpression> metadataConstantMap =
+      new Map<MetadataAnnotation, ConstantExpression>();
 
   JavaScriptConstantCompiler(Compiler compiler)
       : super(compiler, JAVA_SCRIPT_CONSTANT_SYSTEM);
 
-  ConstExp compileVariableWithDefinitions(VariableElement element,
+  ConstantExpression compileVariableWithDefinitions(VariableElement element,
                                           TreeElements definitions,
                                           {bool isConst: false}) {
     if (!isConst && lazyStatics.contains(element)) {
       return null;
     }
-    ConstExp value = super.compileVariableWithDefinitions(
+    ConstantExpression value = super.compileVariableWithDefinitions(
         element, definitions, isConst: isConst);
     if (!isConst && value == null) {
       lazyStatics.add(element);
     }
     return value;
   }
 
-  void addCompileTimeConstantForEmission(Constant constant) {
+  void addCompileTimeConstantForEmission(ConstantValue constant) {
     compiledConstants.add(constant);
   }
 
   /**
    * Returns an [Iterable] of static non final fields that need to be
    * initialized. The fields list must be evaluated in order since they might
    * depend on each other.
    */
   Iterable<VariableElement> getStaticNonFinalFieldsForEmission() {
     return initialVariableValues.keys.where((element) {
       return element.kind == ElementKind.FIELD &&
              !element.isInstanceMember &&
              !element.modifiers.isFinal &&
              // The const fields are all either emitted elsewhere or inlined.
              !element.modifiers.isConst;
     });
   }
 
   List<VariableElement> getLazilyInitializedFieldsForEmission() {
     return new List<VariableElement>.from(lazyStatics);
   }
 
   /**
    * Returns a list of constants topologically sorted so that dependencies
    * appear before the dependent constant.  [preSortCompare] is a comparator
    * function that gives the constants a consistent order prior to the
    * topological sort which gives the constants an ordering that is less
    * sensitive to perturbations in the source code.
    */
-  List<Constant> getConstantsForEmission([preSortCompare]) {
+  List<ConstantValue> getConstantsForEmission([preSortCompare]) {
     // We must emit dependencies before their uses.
-    Set<Constant> seenConstants = new Set<Constant>();
-    List<Constant> result = new List<Constant>();
+    Set<ConstantValue> seenConstants = new Set<ConstantValue>();
+    List<ConstantValue> result = new List<ConstantValue>();
 
-    void addConstant(Constant constant) {
+    void addConstant(ConstantValue constant) {
       if (!seenConstants.contains(constant)) {
         constant.getDependencies().forEach(addConstant);
         assert(!seenConstants.contains(constant));
         result.add(constant);
         seenConstants.add(constant);
       }
     }
 
-    List<Constant> sorted = compiledConstants.toList();
+    List<ConstantValue> sorted = compiledConstants.toList();
     if (preSortCompare != null) {
       sorted.sort(preSortCompare);
     }
     sorted.forEach(addConstant);
     return result;
   }
 
-  ConstExp getInitialValueFor(VariableElement element) {
-    ConstExp initialValue = initialVariableValues[element.declaration];
+  ConstantExpression getInitialValueFor(VariableElement element) {
+    ConstantExpression initialValue =
+        initialVariableValues[element.declaration];
     if (initialValue == null) {
       compiler.internalError(element, "No initial value for given element.");
     }
     return initialValue;
   }
 
-  ConstExp compileNode(Node node, TreeElements elements) {
+  ConstantExpression compileNode(Node node, TreeElements elements) {
     return compileNodeWithDefinitions(node, elements);
   }
 
-  ConstExp compileNodeWithDefinitions(Node node,
+  ConstantExpression compileNodeWithDefinitions(Node node,
                                       TreeElements definitions,
                                       {bool isConst: true}) {
-    ConstExp constant = nodeConstantMap[node];
+    ConstantExpression constant = nodeConstantMap[node];
     if (constant != null) {
       return constant;
     }
     constant =
         super.compileNodeWithDefinitions(node, definitions, isConst: isConst);
     if (constant != null) {
       nodeConstantMap[node] = constant;
     }
     return constant;
   }
 
-  ConstExp getConstantForNode(Node node, TreeElements definitions) {
-    ConstExp constant = nodeConstantMap[node];
+  ConstantExpression getConstantForNode(Node node, TreeElements definitions) {
+    ConstantExpression constant = nodeConstantMap[node];
     if (constant != null) {
       return constant;
     }
     return definitions.getConstant(node);
   }
 
-  ConstExp getConstantForMetadata(MetadataAnnotation metadata) {
+  ConstantExpression getConstantForMetadata(MetadataAnnotation metadata) {
     return metadataConstantMap[metadata];
   }
 
-  ConstExp compileMetadata(MetadataAnnotation metadata,
+  ConstantExpression compileMetadata(MetadataAnnotation metadata,
                            Node node,
                            TreeElements elements) {
-    ConstExp constant = super.compileMetadata(metadata, node, elements);
+    ConstantExpression constant =
+        super.compileMetadata(metadata, node, elements);
     metadataConstantMap[metadata] = constant;
     return constant;
   }
 
-  ConstExp createTypeConstant(TypeDeclarationElement element) {
+  ConstantExpression createTypeConstant(TypeDeclarationElement element) {
     DartType elementType = element.rawType;
     DartType constantType =
         compiler.backend.typeImplementation.computeType(compiler);
-    return new TypeConstExp(
-        new TypeConstant(elementType, constantType), elementType);
+    return new TypeConstantExpression(
+        new TypeConstantValue(elementType, constantType), elementType);
   }
 
   void forgetElement(Element element) {
     element.accept(new ForgetConstantVisitor(this));
   }
 }
 
 class ForgetConstantVisitor extends ElementVisitor {
   final JavaScriptConstantCompiler constants;
 
   ForgetConstantVisitor(this.constants);
 
   void visitElement(Element e) {
     for (MetadataAnnotation data in e.metadata) {
       constants.metadataConstantMap.remove(data);
     }
   }
 
   void visitFunctionElement(FunctionElement e) {
     super.visitFunctionElement(e);
     if (e.hasFunctionSignature) {
       e.functionSignature.forEachParameter(this.visit);
     }
   }
 }