Rename Constant to ConstantValue and ConstExp to ConstantExpression.

sdk/lib/_internal/compiler/implementation/ssa/nodes.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 ssa;
 
 abstract class HVisitor<R> {
   R visitAdd(HAdd node);
   R visitBitAnd(HBitAnd node);
   R visitBitNot(HBitNot node);
@@ skipping 120 matching lines @@
   HBasicBlock exit;
   HThis thisInstruction;
   /// Receiver parameter, set for methods using interceptor calling convention.
   HParameterValue explicitReceiverParameter;
   bool isRecursiveMethod = false;
   bool calledInLoop = false;
   final List<HBasicBlock> blocks;
 
   // We canonicalize all constants used within a graph so we do not
   // have to worry about them for global value numbering.
-  Map<Constant, HConstant> constants;
+  Map<ConstantValue, HConstant> constants;
 
   HGraph()
       : blocks = new List<HBasicBlock>(),
-        constants = new Map<Constant, HConstant>() {
+        constants = new Map<ConstantValue, HConstant>() {
     entry = addNewBlock();
     // The exit block will be added later, so it has an id that is
     // after all others in the system.
     exit = new HBasicBlock();
   }
 
   void addBlock(HBasicBlock block) {
     int id = blocks.length;
     block.id = id;
     blocks.add(block);
     assert(identical(blocks[id], block));
   }
 
   HBasicBlock addNewBlock() {
     HBasicBlock result = new HBasicBlock();
     addBlock(result);
     return result;
   }
 
   HBasicBlock addNewLoopHeaderBlock(JumpTarget target,
                                     List<LabelDefinition> labels) {
     HBasicBlock result = addNewBlock();
     result.loopInformation =
         new HLoopInformation(result, target, labels);
     return result;
   }
 
-  HConstant addConstant(Constant constant, Compiler compiler) {
+  HConstant addConstant(ConstantValue constant, Compiler compiler) {
     HConstant result = constants[constant];
     if (result == null) {
       TypeMask type = constant.computeMask(compiler);
       result = new HConstant.internal(constant, type);
       entry.addAtExit(result);
       constants[constant] = result;
     } else if (result.block == null) {
       // The constant was not used anymore.
       entry.addAtExit(result);
     }
     return result;
   }
 
-  HConstant addDeferredConstant(Constant constant, PrefixElement prefix,
+  HConstant addDeferredConstant(ConstantValue constant, PrefixElement prefix,
                                 Compiler compiler) {
-    Constant wrapper = new DeferredConstant(constant, prefix);
+    ConstantValue wrapper = new DeferredConstantValue(constant, prefix);
     compiler.deferredLoadTask.registerConstantDeferredUse(wrapper, prefix);
     return addConstant(wrapper, compiler);
   }
 
   HConstant addConstantInt(int i, Compiler compiler) {
     return addConstant(compiler.backend.constantSystem.createInt(i), compiler);
   }
 
   HConstant addConstantDouble(double d, Compiler compiler) {
     return addConstant(
@@ skipping 1820 matching lines @@
   static const int DO_WHILE_LOOP = 1;
 
   final int kind;
   HLoopBranch(HInstruction condition, [this.kind = CONDITION_FIRST_LOOP])
       : super(<HInstruction>[condition]);
   toString() => 'loop-branch';
   accept(HVisitor visitor) => visitor.visitLoopBranch(this);
 }
 
 class HConstant extends HInstruction {
-  final Constant constant;
+  final ConstantValue constant;
   HConstant.internal(this.constant, TypeMask constantType)
       : super(<HInstruction>[], constantType);
 
   toString() => 'literal: $constant';
   accept(HVisitor visitor) => visitor.visitConstant(this);
 
   bool isConstant() => true;
   bool isConstantBoolean() => constant.isBool;
   bool isConstantNull() => constant.isNull;
   bool isConstantNumber() => constant.isNum;
@@ skipping 1037 matching lines @@
 class HDynamicType extends HRuntimeType {
   HDynamicType(DynamicType dartType, TypeMask instructionType)
       : super(const <HInstruction>[], dartType, instructionType);
 
   accept(HVisitor visitor) => visitor.visitDynamicType(this);
 
   int typeCode() => HInstruction.DYNAMIC_TYPE_TYPECODE;
 
   bool typeEquals(HInstruction other) => other is HDynamicType;
 }