Better mangling in frog for fixing parts of issue 1837.

frog/corejs.dart

 // Copyright (c) 2011, 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.
 
 /**
  * Generates JS helpers for dart:core. This used to be in a file "core.js".
  * Having them in Dart code means we can easily control which are generated.
  */
 // TODO(jmesserly): one idea to make this cleaner: put these as private "native"
 // methods somewhere in a library that we import. This would be rather elegant
@@ skipping 196 matching lines @@
       // here.
       w.writeln('\$defProp(Object.prototype, "get\$typeName", ' +
                 'Object.prototype.\$typeNameOf);');
     }
   }
 }
 
 
 /** Snippet for `$ne`. */
 final String _NE_FUNCTION = @"""
-function $$ne(x, y) {
+function $ne$(x, y) {
   if (x == null) return y != null;
   return (typeof(x) != 'object') ? x !== y : !x.$eq(y);
 }""";
 
 /** Snippet for `$eq`. */
 final String _EQ_FUNCTION = @"""
-function $$eq(x, y) {
+function $eq$(x, y) {
   if (x == null) return y == null;
   return (typeof(x) != 'object') ? x === y : x.$eq(y);
 }
 // TODO(jimhug): Should this or should it not match equals?
 $defProp(Object.prototype, '$eq', function(other) {
   return this === other;
 });""";
 
 /** Snippet for `$bit_not`. */
 final String _BIT_NOT_FUNCTION = @"""
-function $$bit_not(x) {
+function $bit_not$(x) {
   if (typeof(x) == 'number') return ~x;
   if (typeof(x) == 'object') return  x.$bit_not();
   $throw(new NoSuchMethodException(x, "operator ~", []));
 }""";
 
 /** Snippet for `$negate`. */
 final String _NEGATE_FUNCTION = @"""
-function $$negate(x) {
+function $negate$(x) {
   if (typeof(x) == 'number') return -x;
   if (typeof(x) == 'object') return x.$negate();
   $throw(new NoSuchMethodException(x, "operator negate", []));
 }""";
 
 /** Snippet for `$add`. This relies on JS's string "+" to match Dart's. */
 final String _ADD_FUNCTION = @"""
-function $$add$complex(x, y) {
+function $add$complex$(x, y) {
   if (typeof(x) == 'number') {
     $throw(new IllegalArgumentException(y));
   } else if (typeof(x) == 'string') {
     var str = (y == null) ? 'null' : y.toString();
     if (typeof(str) != 'string') {
       throw new Error("calling toString() on right hand operand of operator " +
       "+ did not return a String");
     }
     return x + str;
   } else if (typeof(x) == 'object') {
     return x.$add(y);
   } else {
     $throw(new NoSuchMethodException(x, "operator +", [y]));
   }
 }
 
-function $$add(x, y) {
+function $add$(x, y) {
   if (typeof(x) == 'number' && typeof(y) == 'number') return x + y;
-  return $$add$complex(x, y);
+  return $add$complex$(x, y);
 }""";
 
 /** Snippet for `$truncdiv`. This uses `$throw`. */
 final String _TRUNCDIV_FUNCTION = @"""
-function $$truncdiv(x, y) {
+function $truncdiv$(x, y) {
   if (typeof(x) == 'number') {
     if (typeof(y) == 'number') {
       if (y == 0) $throw(new IntegerDivisionByZeroException());
       var tmp = x / y;
       return (tmp < 0) ? Math.ceil(tmp) : Math.floor(tmp);
     } else {
       $throw(new IllegalArgumentException(y));
     }
   } else if (typeof(x) == 'object') {
     return x.$truncdiv(y);
   } else {
     $throw(new NoSuchMethodException(x, "operator ~/", [y]));
   }
 }""";
 
 /** Snippet for `$mod`. */
 final String _MOD_FUNCTION = @"""
-function $$mod(x, y) {
+function $mod$(x, y) {
   if (typeof(x) == 'number') {
     if (typeof(y) == 'number') {
       var result = x % y;
       if (result == 0) {
         return 0;  // Make sure we don't return -0.0.
       } else if (result < 0) {
         if (y < 0) {
           return result - y;
         } else {
           return result + y;
         }
       }
       return result;
     } else {
       $throw(new IllegalArgumentException(y));
     }
   } else if (typeof(x) == 'object') {
     return x.$mod(y);
   } else {
     $throw(new NoSuchMethodException(x, "operator %", [y]));
   }
 }""";
 
 /** Code snippet for all other operators. */
 String _otherOperator(String jsname, String op) {
   return """
-function \$$jsname\$complex(x, y) {
+function $jsname\$complex\$(x, y) {
   if (typeof(x) == 'number') {
     \$throw(new IllegalArgumentException(y));
   } else if (typeof(x) == 'object') {
     return x.$jsname(y);
   } else {
     \$throw(new NoSuchMethodException(x, "operator $op", [y]));
   }
 }
-function \$$jsname(x, y) {
+function $jsname\$(x, y) {
   if (typeof(x) == 'number' && typeof(y) == 'number') return x $op y;
-  return \$$jsname\$complex(x, y);
+  return $jsname\$complex\$(x, y);
 }""";
 }
 
 /**
  * Snippet for `$dynamic`. Usage:
  *    $dynamic(name).SomeTypeName = ... method ...;
  *    $dynamic(name).Object = ... noSuchMethod ...;
  */
 final String _DYNAMIC_FUNCTION = @"""
 function $dynamic(name) {
@@ skipping 252 matching lines @@
         var newArgs = Array.prototype.slice.call(arguments);
         Array.prototype.unshift.apply(newArgs, boundArgs);
         return func.apply(thisObj, newArgs);
       };
     } else {
       return function() {
         return func.apply(thisObj, arguments);
       };
     }
   };""";