Treat our type objects as core.Type

lib/runtime/dart_runtime.js

 // 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.
 
 var dart, _js_helper;
 (function (dart) {
   'use strict';
 
   let defineProperty = Object.defineProperty;
   let getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
@@ skipping 43 matching lines @@
   function throwNoSuchMethod(obj, name, args, opt_func) {
     if (obj === void 0) obj = opt_func;
     throw new core.NoSuchMethodError(obj, name, args);
   }
 
   function checkAndCall(f, obj, args, name) {
     if (!(f instanceof Function)) {
       // Grab the `call` method if it's not a function.
       if (f !== null) f = f.call;
       if (!(f instanceof Function)) {
-        throwNoSuchMethod(obj, method, args);
+        throwNoSuchMethod(obj, name, args);
       }
     }
     // TODO(jmesserly): enable this when we can fix => and methods.
     /*
     let formals = formalParameterList(f);
     // TODO(vsm): Type check args!  We need to encode sufficient type info on f.
     if (formals.length < args.length) {
       throwNoSuchMethod(obj, name, args, f);
     } else if (formals.length > args.length) {
       for (let i = args.length; i < formals.length; ++i) {
@@ skipping 125 matching lines @@
     // See if we already know the answer
     // TODO(jmesserly): general purpose memoize function?
     let map = subtypeMap.get(t1);
     let result;
     if (map) {
       result = map.get(t2);
       if (result !== void 0) return result;
     } else {
       subtypeMap.set(t1, map = new Map());
     }
-    map.set(t2, result = isSubtype_(t1, t2));
+    if (t2 == core.Type) {
+      // Special case Types.
+      result = t1.prototype instanceof core.Type ||

[Jennifer Messerly, 2015/04/24 00:43:14]

any reason not to include this in isSubtype_ ? I was trying to keep that one as
the "real" method, with this one just being the memoize glue

[vsm, 2015/04/24 13:25:44]

Yes - the helper is recursive with t2 staying constant, so we'd be repeating
this check every time.

+        t1 instanceof AbstractFunctionType ||
+        isSubtype_(t1, t2);
+    } else {
+      result = isSubtype_(t1, t2)
+    }
+    map.set(t2, result);
     return result;
   }
   dart.isSubtype = isSubtype;
 
   function _isBottom(type, dynamicIsBottom) {
     return (type == dart.dynamic && dynamicIsBottom) || type == dart.bottom;
   }
 
   function _isTop(type, dynamicIsBottom) {
     return type == core.Object || (type == dart.dynamic && !dynamicIsBottom);
@@ skipping 710 matching lines @@
   dart.bottom = { toString() { return 'bottom'; } };
 
   dart.global = window || global;
   dart.JsSymbol = Symbol;
 
   // TODO(jmesserly): hack to bootstrap the SDK
   _js_helper = _js_helper || {};
   _js_helper.checkNum = notNull;
 
 })(dart || (dart = {}));