Fixing string compile-time constant evaluation

frog/frogsh

 #!/usr/bin/env node
 //  ********** Library dart:core **************
 //  ********** Natives dart:core **************
 /**
  * Generates a dynamic call stub for a function.
  * Our goal is to create a stub method like this on-the-fly:
  *   function($0, $1, capture) { this($0, $1, true, capture); }
  *
  * This stub then replaces the dynamic one on Function, with one that is
  * specialized for that particular function, taking into account its default
@@ skipping 13922 matching lines @@
     if ($notnull_bool(x.get$isConst()) && $notnull_bool(y.get$isConst())) {
       var value = (kind == 35/*TokenKind.AND*/) ? $notnull_bool(x.get$actualValue()) && $notnull_bool(y.get$actualValue()) : $notnull_bool(x.get$actualValue()) || $notnull_bool(y.get$actualValue());
       return EvaluatedValue.EvaluatedValue$factory($globals.world.nonNullBool, value, ('' + value), node.span);
     }
     return new Value($globals.world.nonNullBool, code, node.span, true);
   }
   else if (kind == 50/*TokenKind.EQ_STRICT*/ || kind == 51/*TokenKind.NE_STRICT*/) {
     var x = this.visitValue(node.x);
     var y = this.visitValue(node.y);
     if ($notnull_bool(x.get$isConst()) && $notnull_bool(y.get$isConst())) {
-      var value = kind == 50/*TokenKind.EQ_STRICT*/ ? $eq(x.get$actualValue(), y.get$actualValue()) : $ne(x.get$actualValue(), y.get$actualValue());
+      var xVal = x.get$actualValue();
+      var yVal = y.get$actualValue();
+      if ($notnull_bool(x.get$type().get$isString()) && $notnull_bool(y.get$type().get$isString()) && $notnull_bool($ne(xVal.$index(0), yVal.$index(0)))) {
+        if ($notnull_bool($eq(xVal.$index(0), '"'))) {
+          xVal = xVal.substring$2(1, xVal.length - 1);
+          yVal = toDoubleQuote($assert_String(yVal.substring$2(1, yVal.length - 1)));
+        }
+        else {
+          xVal = toDoubleQuote($assert_String(xVal.substring$2(1, xVal.length - 1)));
+          yVal = yVal.substring$2(1, yVal.length - 1);
+        }
+      }
+      var value = kind == 50/*TokenKind.EQ_STRICT*/ ? $eq(xVal, yVal) : $ne(xVal, yVal);
       return EvaluatedValue.EvaluatedValue$factory($globals.world.nonNullBool, value, ("" + value), node.span);
     }
     if ($notnull_bool($eq(x.get$code(), 'null')) || $notnull_bool($eq(y.get$code(), 'null'))) {
       var op = node.op.toString().substring(0, 2);
       return new Value($globals.world.nonNullBool, ('' + x.get$code() + ' ' + op + ' ' + y.get$code()), node.span, true);
     }
     else {
       return new Value($globals.world.nonNullBool, ('' + x.get$code() + ' ' + node.op + ' ' + y.get$code()), node.span, true);
     }
   }
@@ skipping 375 matching lines @@
     var u = (item && item.is$UnaryExpression());
     return u.op.kind == 16/*TokenKind.INCR*/ || u.op.kind == 17/*TokenKind.DECR*/;
   }
   else {
     return false;
   }
 }
 MethodGenerator.prototype.visitLiteralExpression = function(node) {
   var $0;
   var type = node.type.type;
-  $assert($ne(type, null), "type != null", "gen.dart", 2250, 12);
+  $assert($ne(type, null), "type != null", "gen.dart", 2264, 12);
   if (!!(($0 = node.value) && $0.is$List)) {
     var items = [];
     var $list = node.value;
     for (var $i = node.value.iterator$0(); $i.hasNext$0(); ) {
       var item = $i.next$0();
       var val = this.visitValue((item && item.is$lang_Expression()));
       val.invoke$4(this, 'toString', item, Arguments.get$EMPTY());
       var code = val.get$code();
       if ((item instanceof BinaryExpression) || (item instanceof ConditionalExpression) || (item instanceof PostfixExpression) || $notnull_bool(this._isUnaryIncrement((item && item.is$lang_Expression())))) {
         code = ('(' + code + ')');
       }
       if ($notnull_bool($eq(items.length, 0)) || ($notnull_bool($ne(code, "''")) && $notnull_bool($ne(code, '""')))) {
         items.add$1(code);
       }
     }
     return new Value(type, ('(' + Strings.join((items && items.is$List_String()), " + ") + ')'), node.span, true);
   }
   var text = node.text;
   if ($notnull_bool(type.get$isString())) {
     if ($notnull_bool(text.startsWith$1('@'))) {
       text = MethodGenerator._escapeString(parseStringLiteral($assert_String(text)));
       text = ('"' + text + '"');
     }
     else if ($notnull_bool(isMultilineString($assert_String(text)))) {
       text = parseStringLiteral($assert_String(text));
       text = text.replaceAll$2('\n', '\\n');
-      text = text.replaceAll$2('"', '\\"');
+      text = toDoubleQuote($assert_String(text));
       text = ('"' + text + '"');
     }
     if (text !== node.text) {
       node.value = text;
       node.text = $assert_String(text);
     }
   }
   return EvaluatedValue.EvaluatedValue$factory((type && type.is$lang_Type()), node.value, node.text, null);
 }
 MethodGenerator.prototype.visitPostfixExpression$1 = function($0) {
@@ skipping 1655 matching lines @@
   var $list = this.declaringType.get$members().getValues();
   for (var $i = this.declaringType.get$members().getValues().iterator$0(); $i.hasNext$0(); ) {
     var f = $i.next$0();
     if ((f instanceof FieldMember) && !$notnull_bool(f.get$isStatic()) && $notnull_bool($ne(f.get$value(), null)) && !fields.containsKey(f.get$name())) {
       fields.$setindex(f.get$name(), f.computeValue$0());
     }
   }
   return $globals.world.gen.globalForConst(ConstObjectValue.ConstObjectValue$factory(target.type, fields, code, node.span), args.values);
 }
 MethodMember.prototype._invokeBuiltin = function(context, node, target, args, argsCode, isDynamic) {
+  var $0;
   var allConst = $notnull_bool(target.get$isConst()) && args.values.every((function (arg) {
     return arg.get$isConst();
   })
   );
   if ($notnull_bool(this.declaringType.get$isNum())) {
     if (!$notnull_bool(allConst)) {
       var code;
       if (this.name == '\$negate') {
         code = ('-' + target.code);
       }
@@ skipping 123 matching lines @@
       }
       return EvaluatedValue.EvaluatedValue$factory(this.get$inferredResult(), value, ("" + value), node.span);
     }
   }
   else if ($notnull_bool(this.declaringType.get$isString())) {
     if (this.name == '\$index') {
       return new Value(this.declaringType, ('' + target.code + '[' + argsCode.$index(0) + ']'), node.span, true);
     }
     else if (this.name == '\$add') {
       if ($notnull_bool(allConst)) {
-        var val0 = target.get$dynamic().get$actualValue();
-        val0 = val0.substring$2(1, val0.length - 1);
-        var val1 = args.values.$index(0).get$dynamic().get$actualValue();
-        if ($notnull_bool(args.values.$index(0).get$type().get$isString())) {
-          val1 = val1.substring$2(1, val1.length - 1);
-        }
-        var value = ('' + val0 + val1);
-        value = '"' + value.replaceAll$2('"', '\\"') + '"';
-        return EvaluatedValue.EvaluatedValue$factory($globals.world.stringType, value, $assert_String(value), node.span);
+        var value = this._normConcat(target, (($0 = args.values.$index(0)) && $0.is$Value()));
+        return EvaluatedValue.EvaluatedValue$factory($globals.world.stringType, value, value, node.span);
       }
       return new Value(this.declaringType, ('' + target.code + ' + ' + argsCode.$index(0)), node.span, true);
     }
   }
   else if ($notnull_bool(this.declaringType.get$isNative())) {
     if (this.name == '\$index') {
       return new Value(this.returnType, ('' + target.code + '[' + argsCode.$index(0) + ']'), node.span, true);
     }
     else if (this.name == '\$setindex') {
       return new Value(this.returnType, ('' + target.code + '[' + argsCode.$index(0) + '] = ' + argsCode.$index(1)), node.span, true);
@@ skipping 25 matching lines @@
   }
   if (this.name == '\$index') {
     $globals.world.gen.corejs.useIndex = true;
   }
   else if (this.name == '\$setindex') {
     $globals.world.gen.corejs.useSetIndex = true;
   }
   var argsString = Strings.join((argsCode && argsCode.is$List_String()), ', ');
   return new Value(this.get$inferredResult(), ('' + target.code + '.' + this.get$jsname() + '(' + argsString + ')'), node.span, true);
 }
+MethodMember.prototype._normConcat = function(a, b) {
+  $assert(b.type.get$isString(), "b.type.isString", "member.dart", 1250, 12);
+  var val0 = a.get$dynamic().get$actualValue();
+  var quote0 = val0.$index(0);
+  val0 = val0.substring$2(1, val0.length - 1);
+  var val1 = b.get$dynamic().get$actualValue();
+  var quote1 = null;
+  if ($notnull_bool(b.type.get$isString())) {
+    quote1 = val1.$index(0);
+    val1 = val1.substring$2(1, val1.length - 1);
+  }
+  var value;
+  if ($notnull_bool($eq(quote0, quote1)) || $notnull_bool(quote1 == null)) {
+    value = ('' + quote0 + val0 + val1 + quote0);
+  }
+  else if ($notnull_bool($eq(quote0, '"'))) {
+    $assert($eq(quote1, "'"), "quote1 == \"'\"", "member.dart", 1268, 14);
+    value = ('' + quote0 + val0 + toDoubleQuote($assert_String(val1)) + quote0);
+  }
+  else {
+    $assert($eq(quote1, '"'), "quote1 == '\"'", "member.dart", 1271, 14);
+    value = ('' + quote1 + toDoubleQuote($assert_String(val0)) + val1 + quote1);
+  }
+  return $assert_String(value);
+}
 MethodMember.prototype.resolve = function() {
   var $0;
   this.isStatic = this.declaringType.get$isTop();
   this.isConst = false;
   this.isFactory = false;
   this.isAbstract = !$notnull_bool(this.declaringType.get$isClass());
   if (this.definition.modifiers != null) {
     var $list = this.definition.modifiers;
     for (var $i = 0;$i < $list.length; $i++) {
       var mod = $list.$index($i);
@@ skipping 7365 matching lines @@
     values.add(map.$index(k));
   }
   return values;
 }
 function isMultilineString(text) {
   return text.startsWith('"""') || text.startsWith("'''");
 }
 function isRawMultilineString(text) {
   return text.startsWith('@"""') || text.startsWith("@'''");
 }
+function toDoubleQuote(s) {
+  return s.replaceAll('"', '\\"').replaceAll("\\'", "'");
+}
 function parseStringLiteral(lit) {
   if (lit.startsWith('@')) {
     if ($notnull_bool(isRawMultilineString(lit))) {
       return stripLeadingNewline(lit.substring(4, lit.length - 3));
     }
     else {
       return lit.substring(2, lit.length - 1);
     }
   }
   else if ($notnull_bool(isMultilineString(lit))) {
@@ skipping 434 matching lines @@
       NATIVE,
       NEGATE,
       OPERATOR,
       SET,
       SOURCE,
       STATIC,
       TYPEDEF ]*/;
 var $globals = {};
 $static_init();
 main();