Johnni Winther
07ddd00e1b
The front end previously enforced a stricter-than-spec requirement on conflicting imports on its own code. The check was included of the kernel snapshot and therefore always enforced, even in published sdks. The extra check was removed a month ago and now tools/sdks/ have been updated to use a later version of the sdk, so the unneeded hide combinators can now be removed from the source code. Closes #44667 TEST=existing Change-Id: I1d1053b1ef9a40b6a918eef515a02d7b404906c9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/185084 Commit-Queue: Johnni Winther <johnniwinther@google.com> Reviewed-by: Jens Johansen <jensj@google.com>
102 lines
3.8 KiB
Dart
102 lines
3.8 KiB
Dart
// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
// @dart = 2.9
|
|
|
|
import "package:expect/expect.dart" show Expect;
|
|
|
|
import 'package:kernel/ast.dart';
|
|
import 'package:kernel/src/non_null.dart';
|
|
import 'package:kernel/testing/type_parser_environment.dart';
|
|
|
|
const Map<String, String> data = {
|
|
'dynamic': 'dynamic',
|
|
'void': 'void',
|
|
'Null': 'Never',
|
|
'Never': 'Never',
|
|
'Never?': 'Never',
|
|
'Never*': 'Never',
|
|
'Object': 'Object',
|
|
'Object?': 'Object',
|
|
'Object*': 'Object',
|
|
'List<Object>': 'List<Object>',
|
|
'List<Object>?': 'List<Object>',
|
|
'List<Object>*': 'List<Object>',
|
|
'List<Object?>': 'List<Object?>',
|
|
'List<Object?>?': 'List<Object?>',
|
|
'List<Object?>*': 'List<Object?>',
|
|
'List<Object*>': 'List<Object*>',
|
|
'List<Object*>?': 'List<Object*>',
|
|
'List<Object*>*': 'List<Object*>',
|
|
'FutureOr<Null>': 'FutureOr<Never>',
|
|
'FutureOr<dynamic>': 'FutureOr<dynamic>',
|
|
'FutureOr<Object>': 'FutureOr<Object>',
|
|
'FutureOr<Object>?': 'FutureOr<Object>',
|
|
'FutureOr<Object>*': 'FutureOr<Object>',
|
|
'FutureOr<Object?>': 'FutureOr<Object>',
|
|
'FutureOr<Object?>?': 'FutureOr<Object>',
|
|
'FutureOr<Object?>*': 'FutureOr<Object>',
|
|
'FutureOr<Object*>': 'FutureOr<Object>',
|
|
'FutureOr<Object*>?': 'FutureOr<Object>',
|
|
'FutureOr<Object*>*': 'FutureOr<Object>',
|
|
'FutureOr<FutureOr<Object?>>': 'FutureOr<FutureOr<Object>>',
|
|
'(List<Object>, {required List<Object> a, List<Object> b}) -> List<Object>':
|
|
'(List<Object>, {required List<Object> a, List<Object> b})'
|
|
' -> List<Object>',
|
|
'(List<Object>, {required List<Object> a, List<Object> b}) ->? List<Object>':
|
|
'(List<Object>, {required List<Object> a, List<Object> b})'
|
|
' -> List<Object>',
|
|
'(List<Object>, {required List<Object> a, List<Object> b}) ->* List<Object>':
|
|
'(List<Object>, {required List<Object> a, List<Object> b})'
|
|
' -> List<Object>',
|
|
'(List<Object>?, {required List<Object?> a, List<Object?>? b})'
|
|
' ->? List<Object?>':
|
|
'(List<Object>?, {required List<Object?> a, List<Object?>? b})'
|
|
' -> List<Object?>',
|
|
'X': 'X & Object',
|
|
'X?': 'X & Object',
|
|
'X*': 'X & Object',
|
|
'X_extends_Object': 'X_extends_Object',
|
|
'X_extends_Object?': 'X_extends_Object',
|
|
'X_extends_Object*': 'X_extends_Object',
|
|
'X_extends_dynamic': 'X_extends_dynamic',
|
|
'X_extends_dynamic?': 'X_extends_dynamic',
|
|
'X_extends_dynamic*': 'X_extends_dynamic',
|
|
'X & Object?': 'X & Object',
|
|
'X & dynamic': 'X & dynamic',
|
|
'X & Object': 'X & Object',
|
|
'X? & Object?': 'X & Object',
|
|
'X? & dynamic': 'X & dynamic',
|
|
'X? & Object': 'X & Object',
|
|
'Y': 'Y & X & Object',
|
|
'Y?': 'Y & X & Object',
|
|
'Y_extends_dynamic': 'Y_extends_dynamic',
|
|
'Y_extends_dynamic?': 'Y_extends_dynamic',
|
|
'Y_extends_dynamic*': 'Y_extends_dynamic',
|
|
'Y_extends_dynamic & X': 'Y_extends_dynamic & X & Object',
|
|
'Y_extends_dynamic & X_extends_dynamic?':
|
|
'Y_extends_dynamic & X_extends_dynamic',
|
|
};
|
|
|
|
main() {
|
|
Env env = new Env('', isNonNullableByDefault: true)
|
|
..extendWithTypeParameters('X,'
|
|
'X_extends_Object extends Object,'
|
|
'X_extends_dynamic extends dynamic,'
|
|
'Y extends X,'
|
|
'Y_extends_dynamic extends X_extends_dynamic');
|
|
data.forEach((String input, String output) {
|
|
DartType inputType = env.parseType(input);
|
|
DartType expectedOutputType = env.parseType(output);
|
|
DartType actualOutputType = computeNonNull(inputType);
|
|
print('legacyErasure($inputType) = $actualOutputType: $expectedOutputType');
|
|
Expect.equals(
|
|
expectedOutputType,
|
|
actualOutputType,
|
|
"Unexpected NonNull of $inputType ('$input'):\n"
|
|
"Expected: ${expectedOutputType} ('$output')\n"
|
|
"Actual: ${actualOutputType}");
|
|
});
|
|
}
|