| Index: test/dart_codegen/expect/convert/chunked_conversion.dart
|
| diff --git a/test/dart_codegen/expect/convert/chunked_conversion.dart b/test/dart_codegen/expect/convert/chunked_conversion.dart
|
| index 332b95e7561dadd0bd50c7f303d0e346f1725b63..cb58fe433a8f0985f584ce35c4ccdd40c9615002 100644
|
| --- a/test/dart_codegen/expect/convert/chunked_conversion.dart
|
| +++ b/test/dart_codegen/expect/convert/chunked_conversion.dart
|
| @@ -1,39 +1,31 @@
|
| part of dart.convert;
|
| -
|
| -typedef void _ChunkedConversionCallback<T>(T accumulated);
|
| -abstract class ChunkedConversionSink<T> implements Sink<T> {
|
| - ChunkedConversionSink();
|
| - factory ChunkedConversionSink.withCallback(
|
| - void callback(List<T> accumulated)) = _SimpleCallbackSink;
|
| - void add(T chunk);
|
| - void close();
|
| + typedef void _ChunkedConversionCallback<T>(T accumulated);
|
| + abstract class ChunkedConversionSink<T> implements Sink<T> {ChunkedConversionSink();
|
| + factory ChunkedConversionSink.withCallback(void callback(List<T> accumulated)) = _SimpleCallbackSink;
|
| + void add(T chunk);
|
| + void close();
|
| }
|
| -class _SimpleCallbackSink<T> extends ChunkedConversionSink<T> {
|
| - final _ChunkedConversionCallback<List<T>> _callback;
|
| - final List<T> _accumulated = <T>[];
|
| - _SimpleCallbackSink(this._callback);
|
| - void add(T chunk) {
|
| - _accumulated.add(chunk);
|
| - }
|
| - void close() {
|
| - _callback(_accumulated);
|
| - }
|
| + class _SimpleCallbackSink<T> extends ChunkedConversionSink<T> {final _ChunkedConversionCallback<List<T>> _callback;
|
| + final List<T> _accumulated = <T> [];
|
| + _SimpleCallbackSink(this._callback);
|
| + void add(T chunk) {
|
| +_accumulated.add(chunk);
|
| }
|
| -class _EventSinkAdapter<T> implements ChunkedConversionSink<T> {
|
| - final EventSink<T> _sink;
|
| - _EventSinkAdapter(this._sink);
|
| - void add(T data) => _sink.add(data);
|
| - void close() => _sink.close();
|
| + void close() {
|
| +_callback(_accumulated);
|
| }
|
| -class _ConverterStreamEventSink<S, T> implements EventSink<S> {
|
| - final EventSink<T> _eventSink;
|
| - ChunkedConversionSink _chunkedSink;
|
| - _ConverterStreamEventSink(Converter converter, EventSink<T> sink)
|
| - : this._eventSink = sink,
|
| - _chunkedSink = converter.startChunkedConversion(sink);
|
| - void add(S o) => _chunkedSink.add(o);
|
| - void addError(Object error, [StackTrace stackTrace]) {
|
| - _eventSink.addError(error, stackTrace);
|
| - }
|
| - void close() => _chunkedSink.close();
|
| +}
|
| + class _EventSinkAdapter<T> implements ChunkedConversionSink<T> {final EventSink<T> _sink;
|
| + _EventSinkAdapter(this._sink);
|
| + void add(T data) => _sink.add(data);
|
| + void close() => _sink.close();
|
| +}
|
| + class _ConverterStreamEventSink<S, T> implements EventSink<S> {final EventSink<T> _eventSink;
|
| + ChunkedConversionSink _chunkedSink;
|
| + _ConverterStreamEventSink(Converter converter, EventSink<T> sink) : this._eventSink = sink, _chunkedSink = converter.startChunkedConversion(sink);
|
| + void add(S o) => _chunkedSink.add(o);
|
| + void addError(Object error, [StackTrace stackTrace]) {
|
| +_eventSink.addError(error, stackTrace);
|
| +}
|
| + void close() => _chunkedSink.close();
|
| }
|
|
|