| Index: lib/runtime/dart/convert.js
|
| diff --git a/lib/runtime/dart/convert.js b/lib/runtime/dart/convert.js
|
| index 3ed84c4873da7dd9d1a43c2005ae79cf31f4f542..305c004fde3a45b0c01d9d5f61e7d7e9b312e4b7 100644
|
| --- a/lib/runtime/dart/convert.js
|
| +++ b/lib/runtime/dart/convert.js
|
| @@ -6,7 +6,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| 'dart/_internal',
|
| 'dart/collection'
|
| ], /* Lazy imports */[
|
| -], function(exports, dart, core, async, typed_data, _internal, collection) {
|
| +], function(exports, dart, core, $async, typed_data, _internal, collection) {
|
| 'use strict';
|
| let dartx = dart.dartx;
|
| const Codec$ = dart.generic(function(S, T) {
|
| @@ -58,7 +58,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| }
|
| dart.setSignature(Encoding, {
|
| constructors: () => ({Encoding: [Encoding, []]}),
|
| - methods: () => ({decodeStream: [async.Future$(core.String), [async.Stream$(core.List$(core.int))]]}),
|
| + methods: () => ({decodeStream: [$async.Future$(core.String), [$async.Stream$(core.List$(core.int))]]}),
|
| statics: () => ({getByName: [Encoding, [core.String]]}),
|
| names: ['getByName']
|
| });
|
| @@ -113,17 +113,17 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| dart.throw(new core.UnsupportedError(`This converter does not support chunked conversions: ${this}`));
|
| }
|
| bind(source) {
|
| - dart.as(source, async.Stream$(S));
|
| - return async.Stream$(T).eventTransformed(source, dart.fn((sink => new _ConverterStreamEventSink(this, sink)).bind(this), _ConverterStreamEventSink, [async.EventSink]));
|
| + dart.as(source, $async.Stream$(S));
|
| + 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)];
|
| + Converter[dart.implements] = () => [$async.StreamTransformer$(S, T)];
|
| dart.setSignature(Converter, {
|
| constructors: () => ({Converter: [Converter$(S, T), []]}),
|
| methods: () => ({
|
| fuse: [Converter$(S, dart.dynamic), [Converter$(T, dart.dynamic)]],
|
| startChunkedConversion: [ChunkedConversionSink, [core.Sink$(T)]],
|
| - bind: [async.Stream$(T), [async.Stream$(S)]]
|
| + bind: [$async.Stream$(T), [$async.Stream$(S)]]
|
| })
|
| });
|
| return Converter;
|
| @@ -167,7 +167,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| methods: () => ({
|
| convert: [core.List$(core.int), [core.String], [core.int, core.int]],
|
| startChunkedConversion: [StringConversionSink, [core.Sink$(core.List$(core.int))]],
|
| - bind: [async.Stream$(core.List$(core.int)), [async.Stream$(core.String)]]
|
| + bind: [$async.Stream$(core.List$(core.int)), [$async.Stream$(core.String)]]
|
| })
|
| });
|
| class AsciiEncoder extends _UnicodeSubsetEncoder {
|
| @@ -271,7 +271,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| methods: () => ({
|
| convert: [core.String, [core.List$(core.int)], [core.int, core.int]],
|
| [_convertInvalid]: [core.String, [core.List$(core.int), core.int, core.int]],
|
| - bind: [async.Stream$(core.String), [async.Stream$(core.List$(core.int))]]
|
| + bind: [$async.Stream$(core.String), [$async.Stream$(core.List$(core.int))]]
|
| })
|
| });
|
| class AsciiDecoder extends _UnicodeSubsetDecoder {
|
| @@ -523,7 +523,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| }
|
| _EventSinkAdapter[dart.implements] = () => [ChunkedConversionSink$(T)];
|
| dart.setSignature(_EventSinkAdapter, {
|
| - constructors: () => ({_EventSinkAdapter: [_EventSinkAdapter$(T), [async.EventSink$(T)]]}),
|
| + constructors: () => ({_EventSinkAdapter: [_EventSinkAdapter$(T), [$async.EventSink$(T)]]}),
|
| methods: () => ({
|
| add: [dart.void, [T]],
|
| close: [dart.void, []]
|
| @@ -552,9 +552,9 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| return this[_chunkedSink].close();
|
| }
|
| }
|
| - _ConverterStreamEventSink[dart.implements] = () => [async.EventSink$(S)];
|
| + _ConverterStreamEventSink[dart.implements] = () => [$async.EventSink$(S)];
|
| dart.setSignature(_ConverterStreamEventSink, {
|
| - constructors: () => ({_ConverterStreamEventSink: [_ConverterStreamEventSink$(S, T), [Converter, async.EventSink$(T)]]}),
|
| + constructors: () => ({_ConverterStreamEventSink: [_ConverterStreamEventSink$(S, T), [Converter, $async.EventSink$(T)]]}),
|
| methods: () => ({
|
| add: [dart.void, [S]],
|
| addError: [dart.void, [core.Object], [core.StackTrace]],
|
| @@ -887,7 +887,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| methods: () => ({
|
| convert: [core.String, [core.Object]],
|
| startChunkedConversion: [ChunkedConversionSink$(core.Object), [core.Sink$(core.String)]],
|
| - bind: [async.Stream$(core.String), [async.Stream$(core.Object)]],
|
| + bind: [$async.Stream$(core.String), [$async.Stream$(core.Object)]],
|
| fuse: [Converter$(core.Object, dart.dynamic), [Converter$(core.String, dart.dynamic)]]
|
| })
|
| });
|
| @@ -960,7 +960,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| methods: () => ({
|
| convert: [core.List$(core.int), [core.Object]],
|
| startChunkedConversion: [ChunkedConversionSink$(core.Object), [core.Sink$(core.List$(core.int))]],
|
| - bind: [async.Stream$(core.List$(core.int)), [async.Stream$(core.Object)]],
|
| + bind: [$async.Stream$(core.List$(core.int)), [$async.Stream$(core.Object)]],
|
| fuse: [Converter$(core.Object, dart.dynamic), [Converter$(core.List$(core.int), dart.dynamic)]]
|
| }),
|
| statics: () => ({_utf8Encode: [core.List$(core.int), [core.String]]}),
|
| @@ -1051,7 +1051,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| methods: () => ({
|
| convert: [dart.dynamic, [core.String]],
|
| startChunkedConversion: [StringConversionSink, [core.Sink$(core.Object)]],
|
| - bind: [async.Stream$(core.Object), [async.Stream$(core.String)]]
|
| + bind: [$async.Stream$(core.Object), [$async.Stream$(core.String)]]
|
| })
|
| });
|
| function _parseJson(source, reviver) {
|
| @@ -2079,7 +2079,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| methods: () => ({
|
| convert: [core.List$(core.int), [core.String], [core.int, core.int]],
|
| startChunkedConversion: [StringConversionSink, [core.Sink$(core.List$(core.int))]],
|
| - bind: [async.Stream$(core.List$(core.int)), [async.Stream$(core.String)]]
|
| + bind: [$async.Stream$(core.List$(core.int)), [$async.Stream$(core.String)]]
|
| })
|
| });
|
| class _Utf8Encoder extends core.Object {
|
| @@ -2307,7 +2307,7 @@ dart_library.library('dart/convert', null, /* Imports */[
|
| methods: () => ({
|
| convert: [core.String, [core.List$(core.int)], [core.int, core.int]],
|
| startChunkedConversion: [ByteConversionSink, [core.Sink$(core.String)]],
|
| - bind: [async.Stream$(core.String), [async.Stream$(core.List$(core.int))]],
|
| + bind: [$async.Stream$(core.String), [$async.Stream$(core.List$(core.int))]],
|
| fuse: [Converter$(core.List$(core.int), dart.dynamic), [Converter$(core.String, dart.dynamic)]]
|
| })
|
| });
|
|
|