fix #552, Object members on native types

tool/input_sdk/private/ddc_runtime/operations.dart

 // Copyright (c) 2015, 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.
 
 /// This library defines runtime operations on objects used by the code
 /// generator.
 part of dart._runtime;
 
 _canonicalFieldName(obj, name, args, displayName) => JS('', '''(() => {
   $name = $canonicalMember($obj, $name);
@@ skipping 103 matching lines @@
       $throwStrongModeError('call to JS object `' + $obj +
           '` with type arguments <' + $typeArgs + '> is not supported.');
     }
     return $f.apply($obj, $args);
   }
 
   // Apply type arguments
   let formalCount = $ftype[$_typeFormalCount];
   if (formalCount != null) {
     if ($typeArgs == null) {
-      $typeArgs = Array(formalCount).fill($dynamicR);
+      $typeArgs = Array(formalCount).fill($dynamic);
     } else if ($typeArgs.length != formalCount) {
       // TODO(jmesserly): is this the right error?
       $throwStrongModeError(
           'incorrect number of arguments to generic function ' +
           $typeName($ftype) + ', got <' + $typeArgs + '> expected ' +
           formalCount + '.');
     }
     // Instantiate the function.
     $ftype = $ftype(...$typeArgs);
   } else if ($typeArgs != null) {
@@ skipping 126 matching lines @@
   return { min: $f.length, max: $f.length };
 })()''');
 
 equals(x, y) => JS('', '''(() => {
   if ($x == null || $y == null) return $x == $y;
   let eq = $x['=='];
   return eq ? eq.call($x, $y) : $x === $y;
 })()''');
 
 /// Checks that `x` is not null or undefined. */
-notNull(x) => JS('', '''(() => {
-  if ($x == null) $throwNullValueError();
-  return $x;
-})()''');
+notNull(x) {
+  if (x == null) throwNullValueError();
+  return x;
+}
 
 ///
 /// Creates a dart:collection LinkedHashMap.
 ///
 /// For a map with string keys an object literal can be used, for example
 /// `map({'hi': 1, 'there': 2})`.
 ///
 /// Otherwise an array should be used, for example `map([1, 2, 3, 4])` will
 /// create a map with keys [1, 3] and values [2, 4]. Each key-value pair
 /// should be adjacent entries in the array.
 ///
 /// For a map with no keys the function can be called with no arguments, for
 /// example `map()`.
 ///
 // TODO(jmesserly): this could be faster
 // TODO(jmesserly): we can use default values `= dynamic` once #417 is fixed.
 // TODO(jmesserly): move this to classes for consistentcy with list literals?
 map(values, [K, V]) => JS('', '''(() => {
-  if ($K == null) $K = $dynamicR;
-  if ($V == null) $V = $dynamicR;
+  if ($K == null) $K = $dynamic;
+  if ($V == null) $V = $dynamic;
   let map = ${getGenericClass(LinkedHashMap)}($K, $V).new();
   if (Array.isArray($values)) {
     for (let i = 0, end = $values.length - 1; i < end; i += 2) {
       let key = $values[i];
       let value = $values[i + 1];
       map.set(key, value);
     }
   } else if (typeof $values === 'object') {
     for (let key of $getOwnPropertyNames($values)) {
       map.set(key, $values[key]);
@@ skipping 107 matching lines @@
     objectKey.push(name);
     objectKey.push($obj[name]);
   }
   return $multiKeyPutIfAbsent($constants, objectKey, () => $obj);
 })()''');
 
 
 // The following are helpers for Object methods when the receiver
 // may be null or primitive.  These should only be generated by
 // the compiler.
-hashCode(obj) => JS('', '''(() => {
-  if ($obj == null) {
-    return 0;
+hashCode(obj) {
+  if (obj == null) return 0;
+
+  switch (JS('String', 'typeof #', obj)) {
+    case "number":
+      return JS('','# & 0x1FFFFFFF', obj);
+    case "boolean":
+      // From JSBool.hashCode, see comment there.
+      return JS('', '# ? (2 * 3 * 23 * 3761) : (269 * 811)', obj);
   }
-  // TODO(vsm): What should we do for primitives and non-Dart objects?
-  switch (typeof $obj) {
-  case "number":
-  case "boolean":
-    return $obj & 0x1FFFFFFF;
-  case "string":
-      // TODO(vsm): Call the JSString hashCode?
-    return $obj.length;
+
+  var extension = getExtensionType(obj);
+  if (extension != null) {
+    return JS('', '#[dartx.hashCode]', obj);
   }
-  return $obj.hashCode;
-})()''');
+  return JS('', '#.hashCode', obj);
+}
 
-toString(obj) => JS('', '''(() => {
-  if ($obj == null) {
-    return "null";
+@JSExportName('toString')
+_toString(obj) {
+  if (obj == null) return "null";
+
+  var extension = getExtensionType(obj);
+  if (extension != null) {
+    return JS('', '#[dartx.toString]()', obj);
   }
-  return $obj.toString();
-})()''');
+  return JS('', '#.toString()', obj);
+}
 
-noSuchMethod(obj, invocation) => JS('', '''(() => {
-  if ($obj == null) {
-    $throwNoSuchMethod($obj, $invocation.memberName,
-      $invocation.positionalArguments, $invocation.namedArguments);
+// TODO(jmesserly): is the argument type verified statically?
+noSuchMethod(obj, Invocation invocation) {
+  if (obj == null) {
+    throw new NoSuchMethodError(
+        null,
+        invocation.memberName,
+        invocation.positionalArguments,
+        invocation.namedArguments);
   }
-  switch (typeof $obj) {
-    case "number":
-    case "boolean":
-    case "string":
-      $throwNoSuchMethod($obj, $invocation.memberName,
-        $invocation.positionalArguments, $invocation.namedArguments);
+  // TODO(jmesserly): I don't think any extension types define nSM. If they
+  // do we need to add a cast here.

[vsm, 2016/05/09 20:55:56]

Can we sanity check?

var extension = getExtensionType(obj);
if (extension != null) {
  throwNoSuchMethod(...);
}

?

[Jennifer Messerly, 2016/05/10 00:33:57]

Not sure I follow that code example, but yes I went ahead and implemented this
TODO.

Nothing actually overrides nSM in the SDK (can be verified by grepping), so
that's why I didn't. Also we don't actually implement nSM yet which makes it
hard to test :)

I tried to write a test, and I have it in another branch, but it's tied up in
implementing nSM so it has more impacts. If it's all right with you I'll leave
this path untested until I can get nSM going.

+  return JS('', '#.noSuchMethod(#)', obj, invocation);
+}
+
+runtimeType(obj) {
+  // Handle primitives where the method isn't on the object.
+  var result = _checkPrimitiveType(obj);
+  if (result != null) return wrapType(result);
+
+  // Delegate to the (possibly user-defined) method on the object.
+  var extension = getExtensionType(obj);
+  if (extension != null) {
+    return JS('', '#[dartx.runtimeType]', obj);
   }
-  return $obj.noSuchMethod($invocation);
-})()''');
+  return JS('', '#.runtimeType', obj);
+}
 
 final JsIterator = JS('', '''
   class JsIterator {
     constructor(dartIterator) {
       this.dartIterator = dartIterator;
     }
     next() {
       let i = this.dartIterator;
       let done = !i.moveNext();
       return { done: done, value: done ? void 0 : i.current };
     }
   }
 ''');