| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import "dart:_internal" show POWERS_OF_TEN; | 5 import "dart:_internal" show POWERS_OF_TEN; |
| 6 | 6 |
| 7 // JSON conversion. | 7 // JSON conversion. |
| 8 | 8 |
| 9 patch _parseJson(String json, reviver(var key, var value)) { | 9 patch _parseJson(String json, reviver(var key, var value)) { |
| 10 _BuildJsonListener listener; | 10 _BuildJsonListener listener; |
| 11 if (reviver == null) { | 11 if (reviver == null) { |
| 12 listener = new _BuildJsonListener(); | 12 listener = new _BuildJsonListener(); |
| 13 } else { | 13 } else { |
| 14 listener = new _ReviverJsonListener(reviver); | 14 listener = new _ReviverJsonListener(reviver); |
| 15 } | 15 } |
| 16 var parser = new _JsonStringParser(listener); | 16 var parser = new _JsonStringParser(listener); |
| 17 parser.chunk = json; | 17 parser.chunk = json; |
| 18 parser.chunkEnd = json.length; | 18 parser.chunkEnd = json.length; |
| 19 parser.parse(0); | 19 parser.parse(0); |
| 20 parser.close(); | 20 parser.close(); |
| 21 return listener.result; | 21 return listener.result; |
| 22 } | 22 } |
| 23 | 23 |
| 24 patch class Utf8Decoder { | 24 patch class Utf8Decoder { |
| 25 /* patch */ | 25 /* patch */ |
| 26 Converter<List<int>, dynamic> fuse(Converter<String, dynamic> next) { | 26 Converter<List<int>, dynamic/*=T*/> fuse/*<T>*/( |
| 27 Converter<String, dynamic/*=T*/> next) { |
| 27 if (next is JsonDecoder) { | 28 if (next is JsonDecoder) { |
| 28 return new _JsonUtf8Decoder(next._reviver, this._allowMalformed); | 29 return new _JsonUtf8Decoder(next._reviver, this._allowMalformed) |
| 30 as dynamic/*=Converter<List<int>, T>*/; |
| 29 } | 31 } |
| 30 // TODO(lrn): Recognize a fused decoder where the next step is JsonDecoder. | 32 // TODO(lrn): Recognize a fused decoder where the next step is JsonDecoder. |
| 31 return super.fuse(next); | 33 return super.fuse/*<T>*/(next); |
| 32 } | 34 } |
| 33 | 35 |
| 34 // Allow intercepting of UTF-8 decoding when built-in lists are passed. | 36 // Allow intercepting of UTF-8 decoding when built-in lists are passed. |
| 35 /* patch */ | 37 /* patch */ |
| 36 static String _convertIntercepted( | 38 static String _convertIntercepted( |
| 37 bool allowMalformed, List<int> codeUnits, int start, int end) { | 39 bool allowMalformed, List<int> codeUnits, int start, int end) { |
| 38 return null; // This call was not intercepted. | 40 return null; // This call was not intercepted. |
| 39 } | 41 } |
| 40 } | 42 } |
| 41 | 43 |
| 42 class _JsonUtf8Decoder extends | 44 class _JsonUtf8Decoder extends Converter<List<int>, Object> { |
| 43 ChunkedConverter<List<int>, Object, List<int>, Object> { | |
| 44 final _Reviver _reviver; | 45 final _Reviver _reviver; |
| 45 final bool _allowMalformed; | 46 final bool _allowMalformed; |
| 46 | 47 |
| 47 _JsonUtf8Decoder(this._reviver, this._allowMalformed); | 48 _JsonUtf8Decoder(this._reviver, this._allowMalformed); |
| 48 | 49 |
| 49 Object convert(List<int> input) { | 50 Object convert(List<int> input) { |
| 50 var parser = _JsonUtf8DecoderSink._createParser(_reviver, _allowMalformed); | 51 var parser = _JsonUtf8DecoderSink._createParser(_reviver, _allowMalformed); |
| 51 parser.chunk = input; | 52 parser.chunk = input; |
| 52 parser.chunkEnd = input.length; | 53 parser.chunkEnd = input.length; |
| 53 parser.parse(0); | 54 parser.parse(0); |
| (...skipping 1712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1766 _parser.parse(start); | 1767 _parser.parse(start); |
| 1767 } | 1768 } |
| 1768 | 1769 |
| 1769 void close() { | 1770 void close() { |
| 1770 _parser.close(); | 1771 _parser.close(); |
| 1771 var decoded = _parser.result; | 1772 var decoded = _parser.result; |
| 1772 _sink.add(decoded); | 1773 _sink.add(decoded); |
| 1773 _sink.close(); | 1774 _sink.close(); |
| 1774 } | 1775 } |
| 1775 } | 1776 } |
| OLD | NEW |