Constrain type annotations with deferred types.

sdk/lib/_internal/compiler/implementation/js/builder.dart

Index: sdk/lib/_internal/compiler/implementation/js/builder.dart
diff --git a/sdk/lib/_internal/compiler/implementation/js/builder.dart b/sdk/lib/_internal/compiler/implementation/js/builder.dart
index ab05952753b919add5299320118378f664d213a3..ccff49c5f0dcaf24dcce65574f7416f3ee5c553a 100644
--- a/sdk/lib/_internal/compiler/implementation/js/builder.dart
+++ b/sdk/lib/_internal/compiler/implementation/js/builder.dart
@@ -45,6 +45,32 @@ class JsBuilder {
     return call(source, expression);
   }
 
+  /// Creates a litteral js string from [value].
+  LiteralString escapedString(String value) {
+    // Do not escape unicode characters and ' because they are allowed in the
+    // string literal anyway.
+    String escaped =
+        value.replaceAllMapped(new RegExp('\n|"|\\|\0|\b|\t|\v'), (match) {
+      switch (match.group(0)) {
+        case "\n" : return "\\n";

[floitsch, 2014/02/28 12:58:15]

use raw strings.
case "\n": return r"\n";

[sigurdm, 2014/03/03 13:18:49]

Done.

+        case "\\" : return "\\\\";
+        case "\"" : return "\\\"";
+        case "\0" : return "\\0";
+        case "\b" : return "\\b";
+        case "\t" : return "\\t";
+        case "\f" : return "\\f";
+        case "\v" : return "\\v";
+      }
+    });
+    return new LiteralString('"$escaped"');

[floitsch, 2014/02/28 12:58:15]

LiteralString result = string(escaped);
// We don't escape ' under the assumption that the string is wrapped
// into ". Verify that assumption.
assert(result.value.codeUnitAt(0) == '"');
return result;

[sigurdm, 2014/03/03 13:18:49]

Done.

[sigurdm, 2014/03/03 13:18:49]

Done.

+  }
+
+  /// Creates a litteral js string from [value].
+  ///
+  /// Note that this function only puts quotes around [value]. It does not do
+  /// any escaping, so use only when you can guarantee that [value] does not
+  /// contain newlines or backslashes. For escaping the string use
+  /// [escapedString].
   LiteralString string(String value) => new LiteralString('"$value"');
 
   LiteralNumber number(num value) => new LiteralNumber('$value');