| Index: lib/runtime/dart/convert.js
|
| diff --git a/lib/runtime/dart/convert.js b/lib/runtime/dart/convert.js
|
| index 5506c1ca18f1478713deb8d625d314f314c6b4c8..835c2a961715257b9e058556a1cc6740246f5751 100644
|
| --- a/lib/runtime/dart/convert.js
|
| +++ b/lib/runtime/dart/convert.js
|
| @@ -110,7 +110,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| }
|
| bind(source) {
|
| dart.as(source, async.Stream$(S));
|
| - return async.Stream$(T).eventTransformed(source, dart.fn(sink => new _ConverterStreamEventSink(this, sink), _ConverterStreamEventSink, [async.EventSink]));
|
| + return async.Stream$(T).eventTransformed(source, dart.fn((sink => new _ConverterStreamEventSink(this, sink)).bind(this), _ConverterStreamEventSink, [async.EventSink]));
|
| }
|
| }
|
| Converter[dart.implements] = () => [async.StreamTransformer$(S, T)];
|
| @@ -1253,13 +1253,13 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| writeMap(map) {
|
| this.writeString('{');
|
| let separator = '"';
|
| - map.forEach(dart.fn((key, value) => {
|
| + map.forEach(dart.fn(((key, value) => {
|
| this.writeString(separator);
|
| separator = ',"';
|
| this.writeStringContent(key);
|
| this.writeString('":');
|
| this.writeObject(value);
|
| - }, dart.dynamic, [core.String, dart.dynamic]));
|
| + }).bind(this), dart.dynamic, [core.String, dart.dynamic]));
|
| this.writeString('}');
|
| }
|
| }
|
| @@ -1322,7 +1322,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| this.writeString('{\n');
|
| this[_indentLevel] = dart.notNull(this[_indentLevel]) + 1;
|
| let first = true;
|
| - map.forEach(dart.fn((key, value) => {
|
| + map.forEach(dart.fn(((key, value) => {
|
| if (!dart.notNull(first)) {
|
| this.writeString(",\n");
|
| }
|
| @@ -1332,7 +1332,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| this.writeString('": ');
|
| this.writeObject(value);
|
| first = false;
|
| - }, dart.dynamic, [core.String, core.Object]));
|
| + }).bind(this), dart.dynamic, [core.String, core.Object]));
|
| this.writeString('\n');
|
| this[_indentLevel] = dart.notNull(this[_indentLevel]) - 1;
|
| this.writeIndentation(this[_indentLevel]);
|
| @@ -1503,7 +1503,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| let x = this.index;
|
| this.index = dart.notNull(x) + 1;
|
| return x;
|
| - })(), byte);
|
| + }).bind(this)(), byte);
|
| }
|
| }
|
| dart.setSignature(_JsonUtf8Stringifier, {
|
| @@ -2163,39 +2163,39 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 240 | dart.notNull(rune) >> 18);
|
| + }).bind(this)(), 240 | dart.notNull(rune) >> 18);
|
| this[_buffer][dartx.set]((() => {
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 128 | dart.notNull(rune) >> 12 & 63);
|
| + }).bind(this)(), 128 | dart.notNull(rune) >> 12 & 63);
|
| this[_buffer][dartx.set]((() => {
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 128 | dart.notNull(rune) >> 6 & 63);
|
| + }).bind(this)(), 128 | dart.notNull(rune) >> 6 & 63);
|
| this[_buffer][dartx.set]((() => {
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 128 | dart.notNull(rune) & 63);
|
| + }).bind(this)(), 128 | dart.notNull(rune) & 63);
|
| return true;
|
| } else {
|
| this[_buffer][dartx.set]((() => {
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 224 | dart.notNull(leadingSurrogate) >> 12);
|
| + }).bind(this)(), 224 | dart.notNull(leadingSurrogate) >> 12);
|
| this[_buffer][dartx.set]((() => {
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 128 | dart.notNull(leadingSurrogate) >> 6 & 63);
|
| + }).bind(this)(), 128 | dart.notNull(leadingSurrogate) >> 6 & 63);
|
| this[_buffer][dartx.set]((() => {
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 128 | dart.notNull(leadingSurrogate) & 63);
|
| + }).bind(this)(), 128 | dart.notNull(leadingSurrogate) & 63);
|
| return false;
|
| }
|
| }
|
| @@ -2213,7 +2213,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), codeUnit);
|
| + }).bind(this)(), codeUnit);
|
| } else if (dart.notNull(_isLeadSurrogate(codeUnit))) {
|
| if (dart.notNull(this[_bufferIndex]) + 3 >= dart.notNull(this[_buffer][dartx.length]))
|
| break;
|
| @@ -2231,12 +2231,12 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 192 | dart.notNull(rune) >> 6);
|
| + }).bind(this)(), 192 | dart.notNull(rune) >> 6);
|
| this[_buffer][dartx.set]((() => {
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 128 | dart.notNull(rune) & 63);
|
| + }).bind(this)(), 128 | dart.notNull(rune) & 63);
|
| } else {
|
| dart.assert(dart.notNull(rune) <= dart.notNull(_THREE_BYTE_LIMIT));
|
| if (dart.notNull(this[_bufferIndex]) + 2 >= dart.notNull(this[_buffer][dartx.length]))
|
| @@ -2245,17 +2245,17 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 224 | dart.notNull(rune) >> 12);
|
| + }).bind(this)(), 224 | dart.notNull(rune) >> 12);
|
| this[_buffer][dartx.set]((() => {
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 128 | dart.notNull(rune) >> 6 & 63);
|
| + }).bind(this)(), 128 | dart.notNull(rune) >> 6 & 63);
|
| this[_buffer][dartx.set]((() => {
|
| let x = this[_bufferIndex];
|
| this[_bufferIndex] = dart.notNull(x) + 1;
|
| return x;
|
| - })(), 128 | dart.notNull(rune) & 63);
|
| + }).bind(this)(), 128 | dart.notNull(rune) & 63);
|
| }
|
| }
|
| }
|
| @@ -2650,7 +2650,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| get values() {
|
| if (dart.notNull(this[_isUpgraded]))
|
| return this[_upgradedMap].values;
|
| - return _internal.MappedIterable.new(this[_computeKeys](), dart.fn(each => this.get(each)));
|
| + return _internal.MappedIterable.new(this[_computeKeys](), dart.fn((each => this.get(each)).bind(this)));
|
| }
|
| set(key, value) {
|
| if (dart.notNull(this[_isUpgraded])) {
|
| @@ -2667,9 +2667,9 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| }
|
| }
|
| addAll(other) {
|
| - other.forEach(dart.fn((key, value) => {
|
| + other.forEach(dart.fn(((key, value) => {
|
| this.set(key, value);
|
| - }));
|
| + }).bind(this)));
|
| }
|
| containsValue(value) {
|
| if (dart.notNull(this[_isUpgraded]))
|
|
|