Rename Constant to ConstantValue and ConstExp to ConstantExpression.

sdk/lib/_internal/compiler/implementation/patch_parser.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.
 
 /**
  * This library contains the infrastructure to parse and integrate patch files.
  *
  * Three types of elements can be patched: [LibraryElement], [ClassElement],
  * [FunctionElement]. Patches are introduced in patch libraries which are loaded
  * together with the corresponding origin library. Which libraries that are
@@ skipping 98 matching lines @@
  * - Builders shift between declaration and implementation depending on usages.
  * - Compile-time constants use constructor implementation exclusively.
  * - Work on function parameters is performed on the declaration of the function
  *   element.
  */
 
 library patchparser;
 
 import 'dart:async';
 
-import 'constants/values.dart' show Constant;
+import 'constants/values.dart' show ConstantValue;
 import 'dart2jslib.dart'
     show Compiler,
          CompilerTask,
          DiagnosticListener,
          MessageKind,
          Script;
 import 'elements/elements.dart';
 import 'elements/modelx.dart'
     show LibraryElementX,
          MetadataAnnotationX,
@@ skipping 180 matching lines @@
   /// Checks that [annotation] looks like a matching annotation and optionally
   /// applies actions on [element]. Returns `true` if the annotation matched.
   bool apply(Compiler compiler,
              Element element,
              MetadataAnnotation annotation);
 
   /// Checks that the annotation value is valid.
   void validate(Compiler compiler,
                 Element element,
                 MetadataAnnotation annotation,
-                Constant constant);
+                ConstantValue constant);
 
 
   /// Checks [element] for metadata matching the [handler]. Return `true` if
   /// matching metadata was found.
   static bool checkAnnotation(Compiler compiler,
                               Element element,
                               EagerAnnotationHandler handler) {
     for (Link<MetadataAnnotation> link = element.metadata;
          !link.isEmpty;
          link = link.tail) {
@@ skipping 40 matching lines @@
         declaration.setNative(native);
         return true;
       }
     }
     return false;
   }
 
   void validate(Compiler compiler,
                 Element element,
                 MetadataAnnotation annotation,
-                Constant constant) {
+                ConstantValue constant) {
     if (constant.computeType(compiler).element !=
             compiler.nativeAnnotationClass) {
       compiler.internalError(annotation, 'Invalid @Native(...) annotation.');
     }
   }
 }
 
 /// Annotation handler for pre-resolution detection of `@patch` annotations.
 class PatchAnnotationHandler implements EagerAnnotationHandler {
   const PatchAnnotationHandler();
 
   bool isPatchAnnotation(MetadataAnnotation annotation) {
     return annotation.beginToken != null &&
            annotation.beginToken.next.value == 'patch';
   }
 
   bool apply(Compiler compiler,
              Element element,
              MetadataAnnotation annotation) {
     return isPatchAnnotation(annotation);
   }
 
   void validate(Compiler compiler,
                 Element element,
                 MetadataAnnotation annotation,
-                Constant constant) {
+                ConstantValue constant) {
     if (constant != compiler.patchConstant) {
       compiler.internalError(annotation, 'Invalid patch annotation.');
     }
   }
 }
 
 
 void tryPatchGetter(DiagnosticListener listener,
                     Element origin,
                     FunctionElement patch) {
@@ skipping 86 matching lines @@
         "Trying to patch a function more than once.");
   }
   origin.applyPatch(patch);
 }
 
 // TODO(johnniwinther): Add unittest when patch is (real) metadata.
 bool isPatchElement(Compiler compiler, Element element) {
   return EagerAnnotationHandler.checkAnnotation(compiler, element,
       const PatchAnnotationHandler());
 }