dart2js: Support new const operations on strings.

sdk/lib/_internal/compiler/implementation/js_backend/constant_system_javascript.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;
 
 const JAVA_SCRIPT_CONSTANT_SYSTEM = const JavaScriptConstantSystem();
 
 class JavaScriptBitNotOperation extends BitNotOperation {
   const JavaScriptBitNotOperation();
@@ skipping 78 matching lines @@
     if (constant.isInt) {
       IntConstant intConstant = constant;
       if (intConstant.value == 0) {
         return JAVA_SCRIPT_CONSTANT_SYSTEM.createDouble(-0.0);
       }
     }
     return dartNegateOperation.fold(constant);
   }
 }
 
+class JavaScriptAddOperation implements BinaryOperation {
+  final _addOperation = const AddOperation();
+  String get name => _addOperation.name;
+
+  const JavaScriptAddOperation();
+
+  Constant fold(Constant left, Constant right) {
+    Constant result = _addOperation.fold(left, right);
+    if (result == null || result.isString) return result;

[Johnni Winther, 2014/09/24 09:29:22]

This is not needed since convertToJavaScriptConstant is the identity function on
strings.

[floitsch, 2014/09/24 12:53:19]

True, but it is typed to take a NumConstant and return a NumConstant. I could
either change that, or have the test here.
What do you prefer?

[Johnni Winther, 2014/09/25 09:07:56]

Then I think I'd prefer to only call convertToJavaScriptConstant `if (result !=
null && result.isNum) ...`

[floitsch, 2014/09/25 12:29:05]

Done.

+    return JAVA_SCRIPT_CONSTANT_SYSTEM.convertToJavaScriptConstant(result);
+  }
+
+  apply(left, right) => _addOperation.apply(left, right);
+}
+
 class JavaScriptBinaryArithmeticOperation implements BinaryOperation {
   final BinaryOperation dartArithmeticOperation;
 
   const JavaScriptBinaryArithmeticOperation(this.dartArithmeticOperation);
 
   String get name => dartArithmeticOperation.name;
 
   Constant fold(Constant left, Constant right) {
     Constant result = dartArithmeticOperation.fold(left, right);
     if (result == null) return result;
@@ skipping 29 matching lines @@
 }
 
 /**
  * Constant system following the semantics for Dart code that has been
  * compiled to JavaScript.
  */
 class JavaScriptConstantSystem extends ConstantSystem {
   final int BITS31 = 0x8FFFFFFF;
   final int BITS32 = 0xFFFFFFFF;
 
-  final add = const JavaScriptBinaryArithmeticOperation(const AddOperation());
+  final add = const JavaScriptAddOperation();
   final bitAnd = const JavaScriptBinaryBitOperation(const BitAndOperation());
   final bitNot = const JavaScriptBitNotOperation();
   final bitOr = const JavaScriptBinaryBitOperation(const BitOrOperation());
   final bitXor = const JavaScriptBinaryBitOperation(const BitXorOperation());
   final booleanAnd = const BooleanAndOperation();
   final booleanOr = const BooleanOrOperation();
   final divide =
       const JavaScriptBinaryArithmeticOperation(const DivideOperation());
   final equal = const EqualsOperation();
   final greaterEqual = const GreaterEqualOperation();
@@ skipping 173 matching lines @@
       result.add(keyList);
     } else {
       // Add the keys individually to avoid generating an unused list constant
       // for the keys.
       result.addAll(keys);
     }
     result.addAll(values);
     return result;
   }
 }