Allow for instance checking of methods and function aliases.

compiler/lib/implementation/rtt.js

 // 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.
 
 // The following methods are used to handle type information
 //
 
 /** 
  * @constructor
  * @param {string} classkey
  * @param {string=} typekey
  * @param {Array.<RTT>=} typeargs
+ * @param {RTT} returnType
+ * @param {bool} functionType
  */ 
-function RTT(classkey, typekey, typeargs) {
+function RTT(classkey, typekey, typeargs, returnType, functionType) {
   this.classKey = classkey;
   this.typeKey = typekey ? typekey : classkey;
   this.typeArgs = typeargs;
+  this.returnType = returnType; // key for the return type
   this.implementedTypes = {};
+  this.functionType = functionType;
   // Add self
   this.implementedTypes[classkey] = this;
   // Add Object
-  if (classkey != $cls('Object')) {
+  if (!functionType && classkey != $cls('Object')) {
     this.implementedTypes[$cls('Object')] = RTT.objectType;
   }
 }
 
 /** @type {Object.<string, Object>} */
 RTT.types = {};
 
 /** @type {Array.<RTT>} */
 RTT.prototype.derivedTypes = [];
 
 /** @return {string} */
 RTT.prototype.toString = function() { return this.typeKey; }
 
 /**
  * @param {*} value 
  * @return {boolean} Whether this type is implemented by the value
  */
 RTT.prototype.implementedBy = function(value){ 
   return (value == null) ? RTT.nullInstanceOf(this) :
+      this.functionType ? this.implementedByTypeFunc(value) :
       this.implementedByType(RTT.getTypeInfo(value)); 
 };
 
 /** 
  * A helper function for safely looking up a value
  * in a Object used as a map.
  * @param {Object.<*>} map
  * @param {srting} key
  * @return {*} the value or null;
  */
@@ skipping 17 matching lines @@
     for(var i = this.typeArgs.length - 1; i >= 0; i--) {
       if (!this.typeArgs[i].implementedByType(targetTypeInfo.typeArgs[i])) {
         return false;
       }
     }
   }
   return true;
 };
 
 /**
+ * @param {!RTT} other
+ * @return {boolean} Whether this type is implement by other
+ */
+RTT.prototype.implementedByTypeFunc = function(otherType) { 
+  if (otherType === this || otherType === RTT.dynamicType) {
+    return true;
+  }
+  var found = true;
+  var props = Object.getOwnPropertyNames(otherType.implementedTypes);
+  for (var i = 0 ; i < props.length; i++) {
+    found = true;
+    var mapped = otherType.implementedTypes[props[i]];
+    if (mapped.returnType && this.returnType) {
+      if (!this.returnType.implementedByType(mapped.returnType)) {
+        continue;
+      }
+    } else if (mapped.returnType || this.returnType) {
+      continue; //handles mixed undef/defined.  undef/undef falls through
+    }
+    if (mapped.typeArgs && this.typeArgs) {
+      for(var i = this.typeArgs.length - 1; i >= 0; i--) {

[zundel, 2011/11/08 15:28:42]

you are re-using 'i' here, its already used as an iterator in the outer loop.

[codefu, 2011/11/14 19:33:40]

Done.

+        if (!this.typeArgs[i].implementedByType(mapped.typeArgs[i])) {
+          found = false; 
+          break; // fall through and search the next property

[zundel, 2011/11/08 15:28:42]

So, one of the type args doesn't match.  From what I can see, its just going to
skip over this type argument.  If the second type argument matches, and the
first one doesn't, the type is deemed to match?

[codefu, 2011/11/14 19:33:40]

I've changed this around a little in the new patch I'm preparing to upload. 
There should only be one typeargs for a function, so it would break out of the
loop and there would be no others.  'This' should be the RHS of an 'is'
expression, otherType is whatever is returned through a series of RTT lookups.

+        }
+      }
+    } else if (mapped.typeArgs || this.typeArgs) {
+      continue; //handles mixed undef/defined.  undef/undef falls through
+    }
+    if ( found == true ) {
+      return true;
+    }
+  }
+  return false;
+};
+
+/**
  * @return {string} the class name associated with this type
  */
 RTT.prototype.getClassName = function() {
   var name = this.classKey;
   if (name.substr(0, 4) == "cls:") {
     name = name.substr(4);
   }
   if (name.substr(-5) == "$Dart") {
     name = name.substr(0, name.length - 5);
   }
@@ skipping 19 matching lines @@
     case 'number': return Number.$lookupRTT();
     case 'boolean': return Boolean.$lookupRTT();
   } 
   return RTT.placeholderType;
 };
 
 /**
  * @param {string} name
  * @param {function(RTT,Array.<RTT>)=} implementsSupplier 
  * @param {Array.<RTT>=} typeArgs
+ * @param {<RTT>=} returnType (if defined)
+ * @param {bool} type is a function
  * @return {RTT} The RTT information object
  */
-RTT.create = function(name, implementsSupplier, typeArgs) {
+RTT.create = function(name, implementsSupplier, typeArgs, returnType, funtionType) {
   if (name == $cls("Object")) return RTT.objectType;
-  var typekey = RTT.getTypeKey(name, typeArgs);
+  var typekey = RTT.getTypeKey(name, typeArgs, returnType);
   var rtt = $mapLookup(RTT.types, typekey);
   if (rtt) {
     return rtt;
   }
   var classkey = RTT.getTypeKey(name);
-  rtt = new RTT(classkey, typekey, typeArgs);
+  rtt = new RTT(classkey, typekey, typeArgs, returnType, funtionType);
   RTT.types[typekey] = rtt;
-  if (implementsSupplier) {
+  if (!funtionType && implementsSupplier) {
     implementsSupplier(rtt, typeArgs);
   }
   return rtt;
 };
 
 /**
  * @param {string} classkey
  * @param {Array.<(RTT|string)>=} typeargs
+ * @param {string} returntype
  * @return {string}
  */
-RTT.getTypeKey = function(classkey, typeargs) {
+RTT.getTypeKey = function(classkey, typeargs, returntype) {
   var key = classkey;
   if (typeargs) {
     key += "<" + typeargs.join(",") + ">";
   }
+  if (returntype) {
+    key += "-><" + returntype + ">";
+  }
   return key;
 };
 
 /**
  * @return {*} value
  * @return {RTT} return the RTT information object for the value
  */
 RTT.getTypeInfo = function(value) {
   return (value.$typeInfo) ? value.$typeInfo : RTT.getNativeTypeInfo(value);
 };
@@ skipping 124 matching lines @@
   return typeof o == 'number';
 }
 
 /**
  * @param {*} o
  * @return {boolean}
  */
 function $isString(o) {
   return typeof o == 'string';
 }