languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrating dart:convert patch files to NNBD.

Browse source 
Change-Id: Ib1127853bc50682e674ccc783f958e7865118b6a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125063
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Reviewed-by: Nicholas Shahan <nshahan@google.com>
Commit-Queue: Mark Zhou <markzipan@google.com>
This commit is contained in:
Mark Zhou 2019-11-18 22:56:05 +00:00 committed by commit-bot@chromium.org
parent 62c67e40dc
commit 6f00b19174
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
sdk_nnbd/lib/_internal/js_dev_runtime/patch/convert_patch.dart
View file

@ -8,7 +8,7 @@ import 'dart:_js_helper' show argumentErrorValue, patch;
import 'dart:_foreign_helper' show JS;
import 'dart:_interceptors' show JSExtendableArray;
import 'dart:_internal' show MappedIterable, ListIterable;
import 'dart:collection' show Maps, LinkedHashMap, MapBase;
import 'dart:collection' show LinkedHashMap, MapBase;
import 'dart:_native_typed_data' show NativeUint8List;
/**
@ -28,7 +28,7 @@ import 'dart:_native_typed_data' show NativeUint8List;
* Throws [FormatException] if the input is not valid JSON text.
*/
@patch
_parseJson(String source, reviver(Object key, Object value)) {
_parseJson(String source, reviver(key, value)?) {
if (source is! String) throw argumentErrorValue(source);
var parsed;
@ -51,8 +51,7 @@ _parseJson(String source, reviver(Object key, Object value)) {
* Maps. [json] is expected to be freshly allocated so elements can be replaced
* in-place.
*/
_convertJsonToDart(json, reviver(Object key, Object value)) {
assert(reviver != null);
_convertJsonToDart(json, reviver(Object? key, Object? value)) {
walk(e) {
// JavaScript null, string, number, bool are in the correct representation.
if (JS<bool>('!', '# == null', e) ||
@ -212,7 +211,7 @@ class _JsonMap extends MapBase<String, dynamic> {
return value;
}
remove(Object key) {
remove(Object? key) {
if (!_isUpgraded && !containsKey(key)) return null;
return _upgrade().remove(key);
}
@ -296,7 +295,7 @@ class _JsonMap extends MapBase<String, dynamic> {
// safely force a concurrent modification error in case
// someone is iterating over the map here.
if (keys.isEmpty) {
keys.add(null);
keys.add("");
} else {
keys.clear();
}
@ -355,13 +354,13 @@ class _JsonMapKeyIterable extends ListIterable<String> {
/// Delegate to [parent.containsKey] to ensure the performance expected
/// from [Map.keys.containsKey].
bool contains(Object key) => _parent.containsKey(key);
bool contains(Object? key) => _parent.containsKey(key);
}
@patch
class JsonDecoder {
@patch
StringConversionSink startChunkedConversion(Sink<Object> sink) {
StringConversionSink startChunkedConversion(Sink<Object?> sink) {
return _JsonDecoderSink(_reviver, sink);
}
}
@ -373,17 +372,16 @@ class JsonDecoder {
* The sink only creates one object, but its input can be chunked.
*/
// TODO(floitsch): don't accumulate everything before starting to decode.
class _JsonDecoderSink extends _StringSinkConversionSink {
final Function(Object key, Object value) _reviver;
final Sink<Object> _sink;
class _JsonDecoderSink extends _StringSinkConversionSink<StringBuffer> {
final Object? Function(Object? key, Object? value)? _reviver;
final Sink<Object?> _sink;
_JsonDecoderSink(this._reviver, this._sink) : super(StringBuffer(''));
void close() {
super.close();
StringBuffer buffer = _stringSink;
String accumulated = buffer.toString();
buffer.clear();
String accumulated = _stringSink.toString();
_stringSink.clear();
Object decoded = _parseJson(accumulated, _reviver);
_sink.add(decoded);
_sink.close();
@ -399,8 +397,8 @@ class Utf8Decoder {
// Currently not intercepting UTF8 decoding.
@patch
static String _convertIntercepted(
bool allowMalformed, List<int> codeUnits, int start, int end) {
static String? _convertIntercepted(
bool allowMalformed, List<int> codeUnits, int start, int? end) {
// Test `codeUnits is NativeUint8List`. Dart's NativeUint8List is
// implemented by JavaScript's Uint8Array.
if (JS<bool>('!', '# instanceof Uint8Array', codeUnits)) {
@ -410,8 +408,8 @@ class Utf8Decoder {
}
}
static String _convertInterceptedUint8List(
bool allowMalformed, NativeUint8List codeUnits, int start, int end) {
static String? _convertInterceptedUint8List(
bool allowMalformed, NativeUint8List codeUnits, int start, int? end) {
if (allowMalformed) {
// TextDecoder with option {fatal: false} does not produce the same result
// as [Utf8Decoder]. It disagrees on the number of `U+FFFD` (REPLACEMENT
@ -442,12 +440,12 @@ class Utf8Decoder {
JS<NativeUint8List>('!', '#.subarray(#, #)', codeUnits, start, end));
}
static String _useTextDecoderChecked(decoder, NativeUint8List codeUnits) {
static String? _useTextDecoderChecked(decoder, NativeUint8List codeUnits) {
if (_unsafe(codeUnits)) return null;
return _useTextDecoderUnchecked(decoder, codeUnits);
}
static String _useTextDecoderUnchecked(decoder, NativeUint8List codeUnits) {
static String? _useTextDecoderUnchecked(decoder, NativeUint8List codeUnits) {
// If the input is malformed, catch the exception and return `null` to fall
// back on unintercepted decoder. The fallback will either succeed in
// decoding, or report the problem better than TextDecoder.

4
sdk_nnbd/lib/convert/string_conversion.dart
View file

@ -79,11 +79,11 @@ class _ClosableStringSink implements ClosableStringSink {
_sink.writeCharCode(charCode);
}
void write(Object o) {
void write(Object? o) {
_sink.write(o);
}
void writeln([Object o = ""]) {
void writeln([Object? o = ""]) {
_sink.writeln(o);
}