Throw NoSuchMethod or IllegalArgument on bad operators or bad arguments to

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 26 matching lines @@
   CoreJs(): _usedOperators = {}, writer = new CodeWriter();
 
   /**
    * Generates the special operator method, e.g. $add.
    * We want to do $add(x, y) instead of x.$add(y) so it doesn't box.
    * Same idea for the other methods.
    */
   void useOperator(String name) {
     if (_usedOperators[name] != null) return;
 
+    if (name != ':ne' && name != ':eq') {
+      // TODO(jimhug): Only do this once!
+      world.gen.markTypeUsed(world.corelib.types['NoSuchMethodException']);

[kasperl, 2012/02/15 11:54:49]

How about adding a helper for this statement?

[floitsch, 2012/02/15 13:11:43]

Done.

+    }
+    if (name != ':bit_not' && name != ':negate') {
+        // TODO(jimhug): Only do this once!
+      world.gen.markTypeUsed(world.corelib.types['IllegalArgumentException']);
+    }
+
     var code;
     switch (name) {
       case ':ne':
         code = _NE_FUNCTION;
         break;
 
       case ':eq':
         ensureDefProp();
         code = _EQ_FUNCTION;
         break;
@@ skipping 81 matching lines @@
     if (useNotNullBool) {
       useThrow = true;
       w.writeln(_NOTNULL_BOOL_FUNCTION);
     }
 
     if (useThrow) {
       w.writeln(_THROW_FUNCTION);
     }
 
     if (useIndex) {
+      world.gen.markTypeUsed(world.corelib.types['NoSuchMethodException']);
       ensureDefProp();
       w.writeln(options.disableBoundsChecks ?
         _INDEX_OPERATORS : _CHECKED_INDEX_OPERATORS);
     }
 
     if (useSetIndex) {
+      world.gen.markTypeUsed(world.corelib.types['NoSuchMethodException']);
       ensureDefProp();
       w.writeln(options.disableBoundsChecks ?
         _SETINDEX_OPERATORS : _CHECKED_SETINDEX_OPERATORS);
     }
 
     if (useIsolates) {
       if (useWrap0) {
         w.writeln(_WRAP_CALL0_FUNCTION);
       }
       if (useWrap1) {
@@ skipping 24 matching lines @@
                 'Object.prototype.\$typeNameOf);');
     }
   }
 }
 
 
 /** Snippet for `$ne`. */
 final String _NE_FUNCTION = @"""
 function $ne(x, y) {
   if (x == null) return y != null;
-  return (typeof(x) == 'number' && typeof(y) == 'number') ||
-         (typeof(x) == 'boolean' && typeof(y) == 'boolean') ||
-         (typeof(x) == 'string' && typeof(y) == 'string')
-    ? x != y : !x.$eq(y);
+  return (typeof(x) != 'object') ? x !== y : !x.$eq(y);

[kasperl, 2012/02/15 11:54:49]

This changes things for functions, right? I guess that's intentional?

[floitsch, 2012/02/15 13:11:43]

AFAICS functions don't override the $eq method and would use the one on
Object.prototype which does ===. So everything stays the same.

 }""";
 
 /** Snippet for `$eq`. */
 final String _EQ_FUNCTION = @"""
 function $eq(x, y) {
   if (x == null) return y == null;
-  return (typeof(x) == 'number' && typeof(y) == 'number') ||
-         (typeof(x) == 'boolean' && typeof(y) == 'boolean') ||
-         (typeof(x) == 'string' && typeof(y) == 'string')
-    ? x == y : x.$eq(y);
+  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) {
-  return (typeof(x) == 'number') ? ~x : x.$bit_not();
+  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) {
-  return (typeof(x) == 'number') ? -x : x.$negate();
+  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(x, y) {
-  return ((typeof(x) == 'number' && typeof(y) == 'number') ||
-          (typeof(x) == 'string'))
-    ? x + y : x.$add(y);
+  if (typeof(x) == 'number') {

[kasperl, 2012/02/15 11:54:49]

It's hard to understand what this does for performance. Would it be possible to
only cover the number case in this method and call some other method
$add$complex for the other cases so the simple case can be inlined without
dragging everything in? This might make sense for the generic _otherOperator
too.

[floitsch, 2012/02/15 13:11:43]

Done.

+    if (typeof(y) == 'number') return x + y;
+    $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]));
+  }
 }""";
 
 /** Snippet for `$truncdiv`. This uses `$throw`. */
 final String _TRUNCDIV_FUNCTION = @"""
 function $truncdiv(x, y) {
-  if (typeof(x) == 'number' && typeof(y) == 'number') {
-    if (y == 0) $throw(new IntegerDivisionByZeroException());
-    var tmp = x / y;
-    return (tmp < 0) ? Math.ceil(tmp) : Math.floor(tmp);
+  if (typeof(x) == 'number') {
+    if  (typeof(y) == 'number') {

[kasperl, 2012/02/15 11:54:49]

if  ( -> if (

[floitsch, 2012/02/15 13:11:43]

Done.

+      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 {
-    return x.$truncdiv(y);
+    $throw(new NoSuchMethodException(x, "operator ~/", [y]));
   }
 }""";
 
 /** Snippet for `$mod`. */
 final String _MOD_FUNCTION = @"""
 function $mod(x, y) {
-  if (typeof(x) == 'number' && 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;
+  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));
     }
-    return result;
+  } else if (typeof(x) == 'object') {
+    return x.$mod(y);
   } else {
-    return x.$mod(y);
-  }
+    $throw(new NoSuchMethodException(x, "operator %", [y]));
+  }h
 }""";
 
 /** Code snippet for all other operators. */
 String _otherOperator(String jsname, String op) {
   return """
 function $jsname(x, y) {
-  return (typeof(x) == 'number' && typeof(y) == 'number')
-    ? x $op y : x.$jsname(y);
+  if (typeof(x) == 'number') {
+    if (typeof(y) == 'number') {
+      return x $op y;
+    } else {
+      \$throw(new IllegalArgumentException(y));
+    }
+  } else if (typeof(x) == 'object') {
+    return x.$jsname(y);
+  } else {
+    \$throw(new NoSuchMethodException(x, "operator $op", [y]));
+  }
 }""";
 }
 
 /**
  * Snippet for `$dynamic`. Usage:
  *    $dynamic(name).SomeTypeName = ... method ...;
  *    $dynamic(name).Object = ... noSuchMethod ...;
  */
 final String _DYNAMIC_FUNCTION = @"""
 function $dynamic(name) {
@@ skipping 130 matching lines @@
 // to get the right errors - at least in checked mode (once we have that).
 // TODO(jmesserly): do perf analysis, figure out if this is worth it and
 // what the cost of $index $setindex is on all browsers
 
 // Performance of Object.prototype methods can go down because there are
 // so many of them. Instead, first time we hit it, put it on the derived
 // prototype. TODO(jmesserly): make this go away by handling index more
 // like a normal method.
 final String _INDEX_OPERATORS = @"""
 $defProp(Object.prototype, '$index', function(i) {
-  var proto = Object.getPrototypeOf(this);
-  if (proto !== Object) {
-    proto.$index = function(i) { return this[i]; }
-  }
-  return this[i];
+  $throw(new NoSuchMethodException(this, "operator []", [i]));
 });
 $defProp(Array.prototype, '$index', function(i) { 
   return this[i]; 
 });
 $defProp(String.prototype, '$index', function(i) { 
   return this[i]; 
 });""";
 
 final String _CHECKED_INDEX_OPERATORS = @"""
 $defProp(Object.prototype, '$index', function(i) {
-  var proto = Object.getPrototypeOf(this);
-  if (proto !== Object) {
-    proto.$index = function(i) { return this[i]; }
-  }
-  return this[i];
+  $throw(new NoSuchMethodException(this, "operator []", [i]));
 });
 $defProp(Array.prototype, '$index', function(index) {
   var i = index | 0;
   if (i !== index) {
     throw new IllegalArgumentException('index is not int');
   } else if (i < 0 || i >= this.length) {
     throw new IndexOutOfRangeException(index);
   }
   return this[i];
 });
 $defProp(String.prototype, '$index', function(i) {
   return this[i];
 });""";
 
 
 
 /** Snippet for `$setindex` in Object, Array, and String. */
 final String _SETINDEX_OPERATORS = @"""
 $defProp(Object.prototype, '$setindex', function(i, value) {
-  var proto = Object.getPrototypeOf(this);
-  if (proto !== Object) {
-    proto.$setindex = function(i, value) { return this[i] = value; }
-  }
-  return this[i] = value;
+  $throw(new NoSuchMethodException(this, "operator []=", [i, value]));
 });
 $defProp(Array.prototype, '$setindex',
     function(i, value) { return this[i] = value; });""";
 
 final String _CHECKED_SETINDEX_OPERATORS = @"""
 $defProp(Object.prototype, '$setindex', function(i, value) {
-  var proto = Object.getPrototypeOf(this);
-  if (proto !== Object) {
-    proto.$setindex = function(i, value) { return this[i] = value; }
-  }
-  return this[i] = value;
+  $throw(new NoSuchMethodException(this, "operator []=", [i, value]));
 });
 $defProp(Array.prototype, '$setindex', function(index, value) {
   var i = index | 0;
   if (i !== index) {
     throw new IllegalArgumentException('index is not int');
   } else if (i < 0 || i >= this.length) {
     throw new IndexOutOfRangeException(index);
   }
   return this[i] = value;
 });""";
@@ skipping 34 matching lines @@
 
 /** Snippet for `$wrap_call$1`, in case it was not necessary. */
 final String _EMPTY_WRAP_CALL1_FUNCTION =
     @"function $wrap_call$1(fn) { return fn; }";
 
 /** Snippet that initializes the isolates state. */
 final String _ISOLATE_INIT_CODE = @"""
 var $globalThis = this;
 var $globals = null;
 var $globalState = null;""";