fixes #177, FunctionDeclarationStatement and closing over `this`

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 125 matching lines @@
       this._internal(year, month, day, hour, minute, second, millisecond, true);
     }
     now() {
       this._now();
     }
     static parse(formattedString) {
       let re = new RegExp('^([+-]?\\d{4,6})-?(\\d\\d)-?(\\d\\d)' + '(?:[ T](\\d\\d)(?::?(\\d\\d)(?::?(\\d\\d)(.\\d{1,6})?)?)?' + '( ?[zZ]| ?([-+])(\\d\\d)(?::?(\\d\\d))?)?)?$');
       let match = re.firstMatch(formattedString);
       if (match != null) {
         // Function parseIntOrZero: (String) → int
-        function parseIntOrZero(matched) {
+        let parseIntOrZero = matched => {
           if (matched == null)
             return 0;
           return int.parse(matched);
-        }
+        };
         // Function parseDoubleOrZero: (String) → double
-        function parseDoubleOrZero(matched) {
+        let parseDoubleOrZero = matched => {
           if (matched == null)
             return 0.0;
           return double.parse(matched);
-        }
+        };
         let years = int.parse(match.get(1));
         let month = int.parse(match.get(2));
         let day = int.parse(match.get(3));
         let hour = parseIntOrZero(match.get(4));
         let minute = parseIntOrZero(match.get(5));
         let second = parseIntOrZero(match.get(6));
         let addOneMillisecond = false;
         let millisecond = (dart.notNull(parseDoubleOrZero(match.get(7))) * 1000).round();
         if (millisecond == 1000) {
           addOneMillisecond = true;
@@ skipping 313 matching lines @@
       return dart.equals(this[_duration], dart.dload(other, _duration));
     }
     get hashCode() {
       return dart.hashCode(this[_duration]);
     }
     compareTo(other) {
       return this[_duration].compareTo(other[_duration]);
     }
     toString() {
       // Function sixDigits: (int) → String
-      function sixDigits(n) {
+      let sixDigits = n => {
         if (dart.notNull(n) >= 100000)
           return `${n}`;
         if (dart.notNull(n) >= 10000)
           return `0${n}`;
         if (dart.notNull(n) >= 1000)
           return `00${n}`;
         if (dart.notNull(n) >= 100)
           return `000${n}`;
         if (dart.notNull(n) >= 10)
           return `0000${n}`;
         return `00000${n}`;
-      }
+      };
       // Function twoDigits: (int) → String
-      function twoDigits(n) {
+      let twoDigits = n => {
         if (dart.notNull(n) >= 10)
           return `${n}`;
         return `0${n}`;
-      }
+      };
       if (dart.notNull(this.inMicroseconds) < 0) {
         return `-${this['unary-']()}`;
       }
       let twoDigitMinutes = twoDigits(this.inMinutes.remainder(Duration.MINUTES_PER_HOUR));
       let twoDigitSeconds = twoDigits(this.inSeconds.remainder(Duration.SECONDS_PER_MINUTE));
       let sixDigitUs = sixDigits(this.inMicroseconds.remainder(Duration.MICROSECONDS_PER_SECOND));
       return `${this.inHours}:${twoDigitMinutes}:${twoDigitSeconds}.${sixDigitUs}`;
     }
     get isNegative() {
       return dart.notNull(this[_duration]) < 0;
@@ skipping 1568 matching lines @@
       return this[_path];
     }
     get query() {
       return this[_query] == null ? "" : this[_query];
     }
     get fragment() {
       return this[_fragment] == null ? "" : this[_fragment];
     }
     static parse(uri) {
       // Function isRegName: (int) → bool
-      function isRegName(ch) {
+      let isRegName = ch => {
         return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dsend(Uri._regNameTable[$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
-      }
+      };
       let EOI = -1;
       let scheme = "";
       let userinfo = "";
       let host = null;
       let port = null;
       let path = null;
       let query = null;
       let fragment = null;
       let index = 0;
       let pathStart = 0;
       let char = EOI;
       // Function parseAuth: () → void
-      function parseAuth() {
+      let parseAuth = () => {
         if (index == uri.length) {
           char = EOI;
           return;
         }
         let authStart = index;
         let lastColon = -1;
         let lastAt = -1;
         char = uri.codeUnitAt(index);
         while (dart.notNull(index) < dart.notNull(uri.length)) {
           char = uri.codeUnitAt(index);
@@ skipping 37 matching lines @@
               portNumber = dart.notNull(portNumber) * 10 + (dart.notNull(digit) - dart.notNull(Uri._ZERO));
             }
           }
           port = Uri._makePort(portNumber, scheme);
           hostEnd = lastColon;
         }
         host = Uri._makeHost(uri, hostStart, hostEnd, true);
         if (dart.notNull(index) < dart.notNull(uri.length)) {
           char = uri.codeUnitAt(index);
         }
-      }
+      };
       let NOT_IN_PATH = 0;
       let IN_PATH = 1;
       let ALLOW_AUTH = 2;
       let state = NOT_IN_PATH;
       let i = index;
       while (dart.notNull(i) < dart.notNull(uri.length)) {
         char = uri.codeUnitAt(i);
         if (char == Uri._QUESTION || char == Uri._NUMBER_SIGN) {
           state = NOT_IN_PATH;
           break;
@@ skipping 867 matching lines @@
       return dart.toString(sb);
     }
     ['=='](other) {
       if (!dart.is(other, Uri))
         return false;
       let uri = dart.as(other, Uri);
       return this.scheme == uri.scheme && this.hasAuthority == uri.hasAuthority && this.userInfo == uri.userInfo && this.host == uri.host && this.port == uri.port && this.path == uri.path && this.hasQuery == uri.hasQuery && this.query == uri.query && this.hasFragment == uri.hasFragment && this.fragment == uri.fragment;
     }
     get hashCode() {
       // Function combine: (dynamic, dynamic) → int
-      function combine(part, current) {
+      let combine = (part, current) => {
         return dart.as(dart.dsend(dart.dsend(dart.dsend(current, '*', 31), '+', dart.hashCode(part)), '&', 1073741823), int);
-      }
+      };
       return combine(this.scheme, combine(this.userInfo, combine(this.host, combine(this.port, combine(this.path, combine(this.query, combine(this.fragment, 1)))))));
     }
     static _addIfNonEmpty(sb, test, first, second) {
       if ("" != test) {
         sb.write(first);
         sb.write(second);
       }
     }
     static encodeComponent(component) {
       return Uri._uriEncode(dart.as(Uri._unreserved2396Table, List$(int)), component);
@@ skipping 26 matching lines @@
         } else if (index != 0) {
           let key = dart.dsend(element, 'substring', 0, index);
           let value = dart.dsend(element, 'substring', dart.notNull(index) + 1);
           dart.dsetindex(map, Uri.decodeQueryComponent(dart.as(key, String), {encoding: encoding}), Uri.decodeQueryComponent(dart.as(value, String), {encoding: encoding}));
         }
         return map;
       }), Map$(String, String));
     }
     static parseIPv4Address(host) {
       // Function error: (String) → void
-      function error(msg) {
+      let error = msg => {
         throw new FormatException(`Illegal IPv4 address, ${msg}`);
-      }
+      };
       let bytes = host.split('.');
       if (bytes[$length] != 4) {
         error('IPv4 address should contain exactly 4 parts');
       }
       return dart.as(bytes[$map](byteString => {
         let byte = int.parse(dart.as(byteString, String));
         if (dart.notNull(byte) < 0 || dart.notNull(byte) > 255) {
           error('each part must be in the range of `0..255`');
         }
         return byte;
       })[$toList](), List$(int));
     }
     static parseIPv6Address(host, start, end) {
       if (start === void 0)
         start = 0;
       if (end === void 0)
         end = null;
       if (end == null)
         end = host.length;
       // Function error: (String, [dynamic]) → void
-      function error(msg, position) {
+      let error = (msg, position) => {
         if (position === void 0)
           position = null;
         throw new FormatException(`Illegal IPv6 address, ${msg}`, host, dart.as(position, int));
-      }
+      };
       // Function parseHex: (int, int) → int
-      function parseHex(start, end) {
+      let parseHex = (start, end) => {
         if (dart.notNull(end) - dart.notNull(start) > 4) {
           error('an IPv6 part can only contain a maximum of 4 hex digits', start);
         }
         let value = int.parse(host.substring(start, end), {radix: 16});
         if (dart.notNull(value) < 0 || dart.notNull(value) > (1 << 16) - 1) {
           error('each part must be in the range of `0x0..0xFFFF`', start);
         }
         return value;
-      }
+      };
       if (dart.notNull(host.length) < 2)
         error('address is too short');
       let parts = dart.setType([], List$(int));
       let wildcardSeen = false;
       let partStart = start;
       for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
         if (host.codeUnitAt(i) == Uri._COLON) {
           if (i == start) {
             i = dart.notNull(i) + 1;
             if (host.codeUnitAt(i) != Uri._COLON) {
@@ skipping 57 matching lines @@
           bytes[$set](dart.notNull(index) + 1, dart.notNull(value) & 255);
           index = dart.notNull(index) + 2;
         }
       }
       return dart.as(bytes, List$(int));
     }
     static _uriEncode(canonicalTable, text, opts) {
       let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
       let spaceToPlus = opts && 'spaceToPlus' in opts ? opts.spaceToPlus : false;
       // Function byteToHex: (dynamic, dynamic) → dynamic
-      function byteToHex(byte, buffer) {
+      let byteToHex = (byte, buffer) => {
         let hex = '0123456789ABCDEF';
         dart.dsend(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dsend(byte, '>>', 4), int)));
         dart.dsend(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dsend(byte, '&', 15), int)));
-      }
+      };
       let result = new StringBuffer();
       let bytes = encoding.encode(text);
       for (let i = 0; dart.notNull(i) < dart.notNull(bytes[$length]); i = dart.notNull(i) + 1) {
         let byte = bytes[$get](i);
         if (dart.notNull(byte) < 128 && (dart.notNull(canonicalTable[$get](dart.notNull(byte) >> 4)) & 1 << (dart.notNull(byte) & 15)) != 0) {
           result.writeCharCode(byte);
         } else if (dart.notNull(spaceToPlus) && byte == Uri._SPACE) {
           result.writeCharCode(Uri._PLUS);
         } else {
           result.writeCharCode(Uri._PERCENT);
@@ skipping 247 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);