Make typedefs lazy again

lib/runtime/dart/core.js

 var core = dart.defineLibrary(core, {});
 var _js_helper = dart.lazyImport(_js_helper);
 var _internal = dart.lazyImport(_internal);
 var collection = dart.lazyImport(collection);
 var _interceptors = dart.lazyImport(_interceptors);
 var convert = dart.lazyImport(convert);
 (function(exports, _js_helper, _internal, collection, _interceptors, convert) {
   'use strict';
   class Object {
     constructor() {
@@ skipping 58 matching lines @@
   class bool extends Object {
     fromEnvironment(name, opts) {
       let defaultValue = opts && 'defaultValue' in opts ? opts.defaultValue : false;
       throw new UnsupportedError('bool.fromEnvironment can only be used as a const constructor');
     }
     toString() {
       return this ? "true" : "false";
     }
   }
   dart.defineNamedConstructor(bool, 'fromEnvironment');
-  class num extends Object {
-    static parse(input, onError) {
-      if (onError === void 0)
-        onError = null;
-      let source = input.trim();
-      num._parseError = false;
-      let result = int.parse(source, {onError: num._onParseErrorInt});
-      if (!dart.notNull(num._parseError))
-        return result;
-      num._parseError = false;
-      result = double.parse(source, num._onParseErrorDouble);
-      if (!dart.notNull(num._parseError))
-        return result;
-      if (onError == null)
-        throw new FormatException(input);
-      return onError(input);
-    }
-    static _onParseErrorInt(_) {
-      num._parseError = true;
-      return 0;
-    }
-    static _onParseErrorDouble(_) {
-      num._parseError = true;
-      return 0.0;
-    }
-  }
-  num[dart.implements] = () => [Comparable$(num)];
-  class int extends num {
-    fromEnvironment(name, opts) {
-      let defaultValue = opts && 'defaultValue' in opts ? opts.defaultValue : null;
-      throw new UnsupportedError('int.fromEnvironment can only be used as a const constructor');
-    }
-    static parse(source, opts) {
-      let radix = opts && 'radix' in opts ? opts.radix : null;
-      let onError = opts && 'onError' in opts ? opts.onError : null;
-      return _js_helper.Primitives.parseInt(source, radix, onError);
-    }
-  }
-  dart.defineNamedConstructor(int, 'fromEnvironment');
   let Comparator$ = dart.generic(function(T) {
-    let Comparator = dart.typedef('Comparator', dart.functionType(int, [T, T]));
+    let Comparator = dart.typedef('Comparator', () => dart.functionType(int, [T, T]));
     return Comparator;
   });
   let Comparator = Comparator$();
   let Comparable$ = dart.generic(function(T) {
     class Comparable extends Object {
       static compare(a, b) {
         return a.compareTo(b);
       }
     }
     return Comparable;
@@ skipping 264 matching lines @@
   DateTime.MAY = 5;
   DateTime.JUNE = 6;
   DateTime.JULY = 7;
   DateTime.AUGUST = 8;
   DateTime.SEPTEMBER = 9;
   DateTime.OCTOBER = 10;
   DateTime.NOVEMBER = 11;
   DateTime.DECEMBER = 12;
   DateTime.MONTHS_PER_YEAR = 12;
   DateTime._MAX_MILLISECONDS_SINCE_EPOCH = 8640000000000000;
+  class num extends Object {
+    static parse(input, onError) {
+      if (onError === void 0)
+        onError = null;
+      let source = input.trim();
+      num._parseError = false;
+      let result = int.parse(source, {onError: num._onParseErrorInt});
+      if (!dart.notNull(num._parseError))
+        return result;
+      num._parseError = false;
+      result = double.parse(source, num._onParseErrorDouble);
+      if (!dart.notNull(num._parseError))
+        return result;
+      if (onError == null)
+        throw new FormatException(input);
+      return onError(input);
+    }
+    static _onParseErrorInt(_) {
+      num._parseError = true;
+      return 0;
+    }
+    static _onParseErrorDouble(_) {
+      num._parseError = true;
+      return 0.0;
+    }
+  }
+  num[dart.implements] = () => [Comparable$(num)];
   class double extends num {
     static parse(source, onError) {
       if (onError === void 0)
         onError = null;
       return _js_helper.Primitives.parseDouble(source, onError);
     }
   }
   double.NAN = 0.0 / 0.0;
   double.INFINITY = 1.0 / 0.0;
   double.NEGATIVE_INFINITY = -dart.notNull(double.INFINITY);
@@ skipping 663 matching lines @@
     }
   }
   // Function identical: (Object, Object) → bool
   function identical(a, b) {
     return _js_helper.Primitives.identicalImplementation(a, b);
   }
   // Function identityHashCode: (Object) → int
   function identityHashCode(object) {
     return _js_helper.objectHashCode(object);
   }
+  class int extends num {
+    fromEnvironment(name, opts) {
+      let defaultValue = opts && 'defaultValue' in opts ? opts.defaultValue : null;
+      throw new UnsupportedError('int.fromEnvironment can only be used as a const constructor');
+    }
+    static parse(source, opts) {
+      let radix = opts && 'radix' in opts ? opts.radix : null;
+      let onError = opts && 'onError' in opts ? opts.onError : null;
+      return _js_helper.Primitives.parseInt(source, radix, onError);
+    }
+  }
+  dart.defineNamedConstructor(int, 'fromEnvironment');
   class Invocation extends Object {
     get isAccessor() {
       return dart.notNull(this.isGetter) || dart.notNull(this.isSetter);
     }
   }
   let $iterator = dart.JsSymbol('$iterator');
   let $join = dart.JsSymbol('$join');
   let Iterable$ = dart.generic(function(E) {
     class Iterable extends Object {
       Iterable() {
@@ skipping 14 matching lines @@
         let buffer = new StringBuffer();
         buffer.writeAll(this, separator);
         return dart.toString(buffer);
       }
     }
     dart.defineNamedConstructor(Iterable, 'generate');
     return Iterable;
   });
   let Iterable = Iterable$();
   let _Generator$ = dart.generic(function(E) {
-    let _Generator = dart.typedef('_Generator', dart.functionType(E, [int]));
+    let _Generator = dart.typedef('_Generator', () => dart.functionType(E, [int]));
     return _Generator;
   });
   let _Generator = _Generator$();
   let _end = dart.JsSymbol('_end');
   let _start = dart.JsSymbol('_start');
   let _generator = dart.JsSymbol('_generator');
   let $skip = dart.JsSymbol('$skip');
   let $take = dart.JsSymbol('$take');
   let _GeneratorIterable$ = dart.generic(function(E) {
     class _GeneratorIterable extends collection.IterableBase$(E) {
@@ skipping 2232 matching lines @@
   // Exports:
   exports.Object = Object;
   exports.JsName = JsName;
   exports.JsPeerInterface = JsPeerInterface;
   exports.SupportJsExtensionMethod = SupportJsExtensionMethod;
   exports.Deprecated = Deprecated;
   exports.deprecated = deprecated;
   exports.override = override;
   exports.proxy = proxy;
   exports.bool = bool;
-  exports.num = num;
-  exports.int = int;
   exports.Comparator$ = Comparator$;
   exports.Comparator = Comparator;
   exports.Comparable$ = Comparable$;
   exports.Comparable = Comparable;
   exports.DateTime = DateTime;
+  exports.num = num;
   exports.double = double;
   exports.Duration = Duration;
   exports.Error = Error;
   exports.AssertionError = AssertionError;
   exports.TypeError = TypeError;
   exports.CastError = CastError;
   exports.NullThrownError = NullThrownError;
   exports.ArgumentError = ArgumentError;
   exports.RangeError = RangeError;
   exports.IndexError = IndexError;
@@ skipping 10 matching lines @@
   exports.StackOverflowError = StackOverflowError;
   exports.CyclicInitializationError = CyclicInitializationError;
   exports.Exception = Exception;
   exports.FormatException = FormatException;
   exports.IntegerDivisionByZeroException = IntegerDivisionByZeroException;
   exports.Expando$ = Expando$;
   exports.Expando = Expando;
   exports.Function = Function;
   exports.identical = identical;
   exports.identityHashCode = identityHashCode;
+  exports.int = int;
   exports.Invocation = Invocation;
   exports.$iterator = $iterator;
   exports.$join = $join;
   exports.Iterable$ = Iterable$;
   exports.Iterable = Iterable;
   exports.$skip = $skip;
   exports.$take = $take;
   exports.BidirectionalIterator$ = BidirectionalIterator$;
   exports.BidirectionalIterator = BidirectionalIterator;
   exports.Iterator$ = Iterator$;
@@ skipping 64 matching lines @@
   exports.Stopwatch = Stopwatch;
   exports.String = String;
   exports.RuneIterator = RuneIterator;
   exports.StringBuffer = StringBuffer;
   exports.StringSink = StringSink;
   exports.Symbol = Symbol;
   exports.Type = Type;
   exports.Uri = Uri;
   exports.SupportJsExtensionMethods = SupportJsExtensionMethods;
 })(core, _js_helper, _internal, collection, _interceptors, convert);