fixes #226 super == and fixes #227 escape \r \f

[email protected]

Review URL: https://codereview.chromium.org/1183453005.

Author: John Messerly

pkg/dev_compiler/lib/src/codegen/js_codegen.dart

@@ -1938,6 +1938,8 @@ class JSCodegenVisitor extends GeneralizingAstVisitor {
       // We can also do this if both sides are the same primitive type.
       if (_canUsePrimitiveEquality(left, right)) {
         code = op.type == TokenType.EQ_EQ ? '# == #' : '# != #';
+      } else if (left is SuperExpression) {
+        return _emitSend(left, op.lexeme, [right]);
       } else {
         var bang = op.type == TokenType.BANG_EQ ? '!' : '';
         code = '${bang}dart.equals(#, #)';

pkg/dev_compiler/lib/src/js/builder.dart

@@ -300,9 +300,11 @@ class JsBuilder {
     String escaped = value.replaceAll('\\', '\\\\');
     // Do not escape unicode characters and ' because they are allowed in the
     // string literal anyway.
-    escaped = escaped.replaceAllMapped(new RegExp('\n|$quote|\b|\t|\v'), (m) {
+    var re = new RegExp('\n|\r|$quote|\b|\f|\t|\v');
+    escaped = escaped.replaceAllMapped(re, (m) {
       switch (m.group(0)) {
         case "\n" : return r"\n";
+        case "\r" : return r"\r";
         // Quotes are only replaced if they conflict with the containing quote
         case '"':   return r'\"';
         case "'":   return r"\'";

pkg/dev_compiler/test/codegen/expect/misc.js

@@ -22,6 +22,28 @@ dart_library.library('misc', null, /* Imports */[
     return Generic;
   });
   let Generic = Generic$();
+  class Base extends core.Object {
+    Base() {
+      this.x = 1;
+      this.y = 2;
+    }
+    ['=='](obj) {
+      return dart.is(obj, Base) && dart.equals(dart.dload(obj, 'x'), this.x) && dart.equals(dart.dload(obj, 'y'), this.y);
+    }
+  }
+  class Derived extends core.Object {
+    Derived() {
+      this.z = 3;
+    }
+    ['=='](obj) {
+      return dart.is(obj, Derived) && dart.equals(dart.dload(obj, 'z'), this.z) && super['=='](obj);
+    }
+  }
+  function _isWhitespace(ch) {
+    return ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t';
+  }
+  dart.fn(_isWhitespace, core.bool, [core.String]);
+  let _escapeMap = dart.const(dart.map({'\n': '\\n', '\r': '\\r', '\f': '\\f', '\b': '\\b', '\t': '\\t', '\v': '\\v', '': '\\x7F'}));
   function main() {
     core.print(dart.toString(1));
     core.print(dart.toString(1.0));
@@ -30,11 +52,14 @@ dart_library.library('misc', null, /* Imports */[
     core.print(dart.equals(x, core.Object));
     core.print(dart.equals(x, Generic));
     core.print(new (Generic$(core.int))().type);
+    core.print(dart.equals(new Derived(), new Derived()));
   }
   dart.fn(main);
   // Exports:
   exports.UNINITIALIZED = UNINITIALIZED;
   exports.Generic$ = Generic$;
   exports.Generic = Generic;
+  exports.Base = Base;
+  exports.Derived = Derived;
   exports.main = main;
 });

pkg/dev_compiler/test/codegen/expect/misc.txt

@@ -1 +1,10 @@
 // Messages from compiling misc.dart
+info: line 19, column 27 of test/codegen/misc.dart: [DynamicInvoke] obj.x requires dynamic invoke
+    return obj is Base && obj.x == x && obj.y == y;
+                          ^^^^^
+info: line 19, column 41 of test/codegen/misc.dart: [DynamicInvoke] obj.y requires dynamic invoke
+    return obj is Base && obj.x == x && obj.y == y;
+                                        ^^^^^
+info: line 25, column 30 of test/codegen/misc.dart: [DynamicInvoke] obj.z requires dynamic invoke
+    return obj is Derived && obj.z == z && super == obj;
+                             ^^^^^

pkg/dev_compiler/test/codegen/misc.dart

@@ -11,6 +11,37 @@ class Generic<T> {
   Type get type => Generic;
 }
 
+// super ==
+// https://github.com/dart-lang/dev_compiler/issues/226
+class Base {
+  int x = 1, y = 2;
+  operator==(obj) {
+    return obj is Base && obj.x == x && obj.y == y;
+  }
+}
+class Derived {
+  int z = 3;
+  operator==(obj) {
+    return obj is Derived && obj.z == z && super == obj;
+  }
+}
+
+// string escape tests
+// https://github.com/dart-lang/dev_compiler/issues/227
+bool _isWhitespace(String ch) =>
+    ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t';
+
+const _escapeMap = const {
+  '\n': r'\n',
+  '\r': r'\r',
+  '\f': r'\f',
+  '\b': r'\b',
+  '\t': r'\t',
+  '\v': r'\v',
+  '\x7F': r'\x7F', // delete
+};
+
+
 main() {
   // Number literals in call expressions.
   print(1.toString());
@@ -24,4 +55,6 @@ main() {
 
   // Should be Generic<dynamic>
   print(new Generic<int>().type);
+
+  print(new Derived() == new Derived()); // true
 }