Remove computeMask from ConstantValue.

pkg/compiler/lib/src/js_backend/constant_emitter.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 js_backend;
 
 class ConstantEmitter {
   ConstantReferenceEmitter _referenceEmitter;
   ConstantLiteralEmitter _literalEmitter;
 
@@ skipping 37 matching lines @@
   jsAst.Expression initializationExpression(ConstantValue constant) {
     return _literalEmitter.generate(constant);
   }
 }
 
 /**
  * Visitor for generating JavaScript expressions to refer to [ConstantValue]s.
  * Do not use directly, use methods from [ConstantEmitter].
  */
 class ConstantReferenceEmitter
-    implements ConstantValueVisitor<jsAst.Expression> {
+    implements ConstantValueVisitor<jsAst.Expression, Null> {
   final Compiler compiler;
   final Namer namer;
 
   final ConstantEmitter constantEmitter;
 
   ConstantReferenceEmitter(this.compiler, this.namer, this.constantEmitter);
 
   jsAst.Expression generate(ConstantValue constant) {
     return _visit(constant);
   }
 
   jsAst.Expression _visit(ConstantValue constant) {
-    return constant.accept(this);
+    return constant.accept(this, null);
   }
 
   jsAst.Expression emitCanonicalVersion(ConstantValue constant) {
     String name = namer.constantName(constant);
     return new jsAst.PropertyAccess.field(
         new jsAst.VariableUse(namer.globalObjectForConstant(constant)), name);
   }
 
   jsAst.Expression literal(ConstantValue constant) {
       return constantEmitter.literal(constant);
   }
 
-  jsAst.Expression visitFunction(FunctionConstantValue constant) {
+  @override
+  jsAst.Expression visitFunction(FunctionConstantValue constant, [_]) {
     return namer.isolateStaticClosureAccess(constant.element);
   }
 
-  jsAst.Expression visitNull(NullConstantValue constant) {
+  @override
+  jsAst.Expression visitNull(NullConstantValue constant, [_]) {
     return literal(constant);
   }
 
-  jsAst.Expression visitInt(IntConstantValue constant) {
+  @override
+  jsAst.Expression visitInt(IntConstantValue constant, [_]) {
     return literal(constant);
   }
 
-  jsAst.Expression visitDouble(DoubleConstantValue constant) {
+  @override
+  jsAst.Expression visitDouble(DoubleConstantValue constant, [_]) {
     return literal(constant);
   }
 
-  jsAst.Expression visitTrue(TrueConstantValue constant) {
+  @override
+  jsAst.Expression visitBool(BoolConstantValue constant, [_]) {
     return literal(constant);
   }
 
-  jsAst.Expression visitFalse(FalseConstantValue constant) {
-    return literal(constant);
-  }
-
   /**
    * Write the contents of the quoted string to a [CodeBuffer] in
    * a form that is valid as JavaScript string literal content.
    * The string is assumed quoted by double quote characters.
    */
-  jsAst.Expression visitString(StringConstantValue constant) {
+  @override
+  jsAst.Expression visitString(StringConstantValue constant, [_]) {
     // TODO(sra): If the string is long *and repeated* (and not on a hot path)
     // then it should be assigned to a name.  We don't have reference counts (or
     // profile information) here, so this is the wrong place.
     return literal(constant);
   }
 
-  jsAst.Expression visitList(ListConstantValue constant) {
+  @override
+  jsAst.Expression visitList(ListConstantValue constant, [_]) {
     return emitCanonicalVersion(constant);
   }
 
-  jsAst.Expression visitMap(MapConstantValue constant) {
+  @override
+  jsAst.Expression visitMap(MapConstantValue constant, [_]) {
     return emitCanonicalVersion(constant);
   }
 
-  jsAst.Expression visitType(TypeConstantValue constant) {
+  @override
+  jsAst.Expression visitType(TypeConstantValue constant, [_]) {
     return emitCanonicalVersion(constant);
   }
 
-  jsAst.Expression visitConstructed(ConstructedConstantValue constant) {
+  @override
+  jsAst.Expression visitConstructed(ConstructedConstantValue constant, [_]) {
     return emitCanonicalVersion(constant);
   }
 
-  jsAst.Expression visitInterceptor(InterceptorConstantValue constant) {
+  @override
+  jsAst.Expression visitInterceptor(InterceptorConstantValue constant, [_]) {
     return emitCanonicalVersion(constant);
   }
 
-  jsAst.Expression visitDummy(DummyConstantValue constant) {
+  @override
+  jsAst.Expression visitDummy(DummyConstantValue constant, [_]) {
     return literal(constant);
   }
 
-  jsAst.Expression visitDeferred(DeferredConstantValue constant) {
+  @override
+  jsAst.Expression visitDeferred(DeferredConstantValue constant, [_]) {
     return emitCanonicalVersion(constant);
   }
 }
 
 /**
  * Visitor for generating JavaScript expressions that litterally represent
  * [ConstantValue]s. These can be used for inlining constants or in
  * initializers. Do not use directly, use methods from [ConstantEmitter].
  */
-class ConstantLiteralEmitter implements ConstantValueVisitor<jsAst.Expression> {
+class ConstantLiteralEmitter
+    implements ConstantValueVisitor<jsAst.Expression, Null> {
 
   // Matches blank lines, comment lines and trailing comments that can't be part
   // of a string.
   static final RegExp COMMENT_RE =
       new RegExp(r'''^ *(//.*)?\n|  *//[^''"\n]*$''' , multiLine: true);
 
   final Compiler compiler;
   final Namer namer;
   final jsAst.Template makeConstantListTemplate;
   final ConstantEmitter constantEmitter;
 
   ConstantLiteralEmitter(this.compiler,
                          this.namer,
                          this.makeConstantListTemplate,
                          this.constantEmitter);
 
   jsAst.Expression generate(ConstantValue constant) {
     return _visit(constant);
   }
 
   jsAst.Expression _visit(ConstantValue constant) {
-    return constant.accept(this);
+    return constant.accept(this, null);
   }
 
-  jsAst.Expression visitFunction(FunctionConstantValue constant) {
+  @override
+  jsAst.Expression visitFunction(FunctionConstantValue constant, [_]) {
     compiler.internalError(NO_LOCATION_SPANNABLE,
         "The function constant does not need specific JS code.");
     return null;
   }
 
-  jsAst.Expression visitNull(NullConstantValue constant) {
+  @override
+  jsAst.Expression visitNull(NullConstantValue constant, [_]) {
     return new jsAst.LiteralNull();
   }
 
-  jsAst.Expression visitInt(IntConstantValue constant) {
+  @override
+  jsAst.Expression visitInt(IntConstantValue constant, [_]) {
     return new jsAst.LiteralNumber('${constant.primitiveValue}');
   }
 
-  jsAst.Expression visitDouble(DoubleConstantValue constant) {
+  @override
+  jsAst.Expression visitDouble(DoubleConstantValue constant, [_]) {
     double value = constant.primitiveValue;
     if (value.isNaN) {
       return js("0/0");
     } else if (value == double.INFINITY) {
       return js("1/0");
     } else if (value == -double.INFINITY) {
       return js("-1/0");
     } else {
       return new jsAst.LiteralNumber("$value");
     }
   }
 
-  jsAst.Expression visitTrue(TrueConstantValue constant) {
+  @override
+  jsAst.Expression visitBool(BoolConstantValue constant, [_]) {
     if (compiler.enableMinification) {
-      // Use !0 for true.
-      return js("!0");
+      if (constant.isTrue) {
+        // Use !0 for true.
+        return js("!0");
+      } else {
+        // Use !1 for false.
+        return js("!1");
+      }
     } else {
-      return js('true');
+      return constant.isTrue ? js('true') : js('false');
     }
   }
 
-  jsAst.Expression visitFalse(FalseConstantValue constant) {
-    if (compiler.enableMinification) {
-      // Use !1 for false.
-      return js("!1");
-    } else {
-      return js('false');
-    }
-  }
-
   /**
    * Write the contents of the quoted string to a [CodeBuffer] in
    * a form that is valid as JavaScript string literal content.
    * The string is assumed quoted by double quote characters.
    */
-  jsAst.Expression visitString(StringConstantValue constant) {
+  @override
+  jsAst.Expression visitString(StringConstantValue constant, [_]) {
     StringBuffer sb = new StringBuffer();
     writeJsonEscapedCharsOn(constant.primitiveValue.slowToString(), sb);
     return new jsAst.LiteralString('"$sb"');
   }
 
-  jsAst.Expression visitList(ListConstantValue constant) {
+  @override
+  jsAst.Expression visitList(ListConstantValue constant, [_]) {
     List<jsAst.Expression> elements = _array(constant.entries);
     jsAst.ArrayInitializer array = new jsAst.ArrayInitializer(elements);
     jsAst.Expression value = makeConstantListTemplate.instantiate([array]);
     return maybeAddTypeArguments(constant.type, value);
   }
 
   jsAst.Expression getJsConstructor(ClassElement element) {
     return namer.elementAccess(element);
   }
 
-  jsAst.Expression visitMap(JavaScriptMapConstant constant) {
+  @override
+  jsAst.Expression visitMap(JavaScriptMapConstant constant, [_]) {
     jsAst.Expression jsMap() {
       List<jsAst.Property> properties = <jsAst.Property>[];
       for (int i = 0; i < constant.length; i++) {
         StringConstantValue key = constant.keys[i];
         if (key.primitiveValue == JavaScriptMapConstant.PROTO_PROPERTY) {
           continue;
         }
 
         // Keys in literal maps must be emitted in place.
         jsAst.Literal keyExpression = _visit(key);
@@ skipping 61 matching lines @@
         new jsAst.New(getJsConstructor(classElement), arguments);
     return maybeAddTypeArguments(constant.type, value);
   }
 
   JavaScriptBackend get backend => compiler.backend;
 
   jsAst.PropertyAccess getHelperProperty(Element helper) {
     return backend.namer.elementAccess(helper);
   }
 
-  jsAst.Expression visitType(TypeConstantValue constant) {
+  @override
+  jsAst.Expression visitType(TypeConstantValue constant, [_]) {
     DartType type = constant.representedType;
     String name = namer.getRuntimeTypeName(type.element);
     jsAst.Expression typeName = new jsAst.LiteralString("'$name'");
     return new jsAst.Call(getHelperProperty(backend.getCreateRuntimeType()),
                           [typeName]);
   }
 
-  jsAst.Expression visitInterceptor(InterceptorConstantValue constant) {
+  @override
+  jsAst.Expression visitInterceptor(InterceptorConstantValue constant, [_]) {
     return new jsAst.PropertyAccess.field(
         getJsConstructor(constant.dispatchedType.element),
         'prototype');
   }
 
-  jsAst.Expression visitDummy(DummyConstantValue constant) {
+  @override
+  jsAst.Expression visitDummy(DummyConstantValue constant, [_]) {
     return new jsAst.LiteralNumber('0');
   }
 
-  jsAst.Expression visitConstructed(ConstructedConstantValue constant) {
+  @override
+  jsAst.Expression visitConstructed(ConstructedConstantValue constant, [_]) {
     Element element = constant.type.element;
     if (element.isForeign(backend)
         && element.name == 'JS_CONST') {
       StringConstantValue str = constant.fields[0];
       String value = str.primitiveValue.slowToString();
       return new jsAst.LiteralExpression(stripComments(value));
     }
     jsAst.New instantiation = new jsAst.New(
         getJsConstructor(constant.type.element),
         _array(constant.fields));
@@ skipping 19 matching lines @@
           .map((DartType type) =>
               rti.getTypeRepresentationWithHashes(type, (_){}));
       jsAst.Expression argumentList =
           new jsAst.LiteralString('[${arguments.join(', ')}]');
       return new jsAst.Call(getHelperProperty(backend.getSetRuntimeTypeInfo()),
                             [value, argumentList]);
     }
     return value;
   }
 
-  jsAst.Expression visitDeferred(DeferredConstantValue constant) {
+  @override
+  jsAst.Expression visitDeferred(DeferredConstantValue constant, [_]) {
     return constantEmitter.reference(constant.referenced);
   }
 }