| Index: test/checker/inferred_type_test.dart
|
| diff --git a/test/checker/inferred_type_test.dart b/test/checker/inferred_type_test.dart
|
| index e9c8d7737c99b92b2f89df45ef0b55a25e4ca163..74bc6bc4ed88921c725fff67b8bedc10dab6e7b6 100644
|
| --- a/test/checker/inferred_type_test.dart
|
| +++ b/test/checker/inferred_type_test.dart
|
| @@ -41,7 +41,7 @@ void main() {
|
| '/main.dart': '''
|
| test1() {
|
| int x = 3;
|
| - x = /*warning:DownCastLiteral*/null;
|
| + x = /*warning:InferableLiteral*/null;
|
| }
|
| '''
|
| }, nonnullableTypes: <String>['int', 'double']);
|
| @@ -51,7 +51,7 @@ void main() {
|
| '/main.dart': '''
|
| test1() {
|
| var x = 3;
|
| - x = /*warning:DownCastLiteral*/null;
|
| + x = /*warning:InferableLiteral*/null;
|
| }
|
| '''
|
| }, nonnullableTypes: <String>['int', 'double']);
|
| @@ -267,7 +267,7 @@ void main() {
|
| test1() {
|
| int t = 3;
|
| t = x;
|
| - t = /*info:DownCast*/y;
|
| + t = /*info:DynamicCast*/y;
|
| }
|
| '''
|
| }, inferTransitively: true);
|
| @@ -284,7 +284,7 @@ void main() {
|
| test1() {
|
| int t = 3;
|
| t = A.x;
|
| - t = /*info:DownCast*/A.y;
|
| + t = /*info:DynamicCast*/A.y;
|
| }
|
| '''
|
| }, inferTransitively: true);
|
| @@ -311,8 +311,8 @@ void main() {
|
| test1() {
|
| int x = 0;
|
| // inference in A disabled (flag is off)
|
| - x = /*info:DownCast*/A.a1;
|
| - x = /*info:DownCast*/new A().a2;
|
| + x = /*info:DynamicCast*/A.a1;
|
| + x = /*info:DynamicCast*/new A().a2;
|
| }
|
| '''
|
| });
|
| @@ -360,7 +360,7 @@ void main() {
|
| a = w;
|
| a = x;
|
| a = y;
|
| - a = /*info:DownCast*/z;
|
| + a = /*info:DynamicCast*/z;
|
| }
|
| '''
|
| }, inferTransitively: true);
|
| @@ -433,18 +433,18 @@ void main() {
|
| // not when it depends on other fields within the cycle
|
| x = C.c1;
|
| x = D.d1;
|
| - x = /*info:DownCast*/D.d2;
|
| + x = /*info:DynamicCast*/D.d2;
|
| x = new C().c2;
|
| x = new D().d3;
|
| - x = /*info:DownCast*/new D().d4;
|
| + x = /*info:DynamicCast*/new D().d4;
|
|
|
|
|
| // Similarly if the library contains parts.
|
| x = E.e1;
|
| - x = /*info:DownCast*/E.e2;
|
| + x = /*info:DynamicCast*/E.e2;
|
| x = E.e3;
|
| x = new E().e4;
|
| - x = /*info:DownCast*/new E().e5;
|
| + x = /*info:DynamicCast*/new E().e5;
|
| x = new E().e6;
|
| x = F.f1;
|
| x = new F().f2;
|
| @@ -523,9 +523,9 @@ void main() {
|
| A a;
|
| B b;
|
| a = t1;
|
| - i = /*info:DownCast*/t2;
|
| + i = /*info:DynamicCast*/t2;
|
| b = t3;
|
| - i = /*info:DownCast*/t4;
|
| + i = /*info:DynamicCast*/t4;
|
| i = new B().y; // B.y was inferred though
|
| }
|
| '''
|
| @@ -555,7 +555,7 @@ void main() {
|
| a = t1;
|
| i = t2;
|
| b = t3;
|
| - i = /*info:DownCast*/t4;
|
| + i = /*info:DynamicCast*/t4;
|
| i = new B().y; // B.y was inferred though
|
| }
|
| '''
|
| @@ -573,7 +573,7 @@ void main() {
|
| test() {
|
| var l = List<Foo>();
|
| for (var x in list) {
|
| - String y = /*info:DownCast should be severe:StaticTypeError*/x;
|
| + String y = /*info:DynamicCast should be severe:StaticTypeError*/x;
|
| }
|
| }
|
| '''
|
| @@ -616,7 +616,7 @@ void main() {
|
|
|
| test() {
|
| dynamic a = new A();
|
| - A b = /*info:DownCast*/a;
|
| + A b = /*info:DynamicCast*/a;
|
| print(/*warning:DynamicInvoke*/a.x);
|
| print((/*warning:DynamicInvoke*/a.x) + 2);
|
| }
|
| @@ -682,8 +682,8 @@ void main() {
|
| }
|
|
|
| foo() {
|
| - String y = /*info:DownCast*/new B().x;
|
| - int z = /*info:DownCast*/new B().x;
|
| + String y = /*info:DynamicCast*/new B().x;
|
| + int z = /*info:DynamicCast*/new B().x;
|
| }
|
| '''
|
| }, inferFromOverrides: false);
|
| @@ -716,8 +716,8 @@ void main() {
|
| }
|
|
|
| foo() {
|
| - String y = /*info:DownCast*/new B().x;
|
| - int z = /*info:DownCast*/new B().x;
|
| + String y = /*info:DynamicCast*/new B().x;
|
| + int z = /*info:DynamicCast*/new B().x;
|
| }
|
| '''
|
| }, inferFromOverrides: false);
|
| @@ -753,8 +753,8 @@ void main() {
|
| }
|
|
|
| foo() {
|
| - String y = /*info:DownCast*/new B().x;
|
| - int z = /*info:DownCast*/new B().x;
|
| + String y = /*info:DynamicCast*/new B().x;
|
| + int z = /*info:DynamicCast*/new B().x;
|
| }
|
| '''
|
| }, inferFromOverrides: infer);
|
| @@ -771,8 +771,8 @@ void main() {
|
| }
|
|
|
| foo() {
|
| - String y = /*info:DownCast*/new B().x;
|
| - int z = /*info:DownCast*/new B().x;
|
| + String y = /*info:DynamicCast*/new B().x;
|
| + int z = /*info:DynamicCast*/new B().x;
|
| }
|
| '''
|
| }, inferFromOverrides: false);
|
| @@ -918,8 +918,8 @@ void main() {
|
| }
|
|
|
| foo() {
|
| - String y = /*info:DownCast*/new B().x;
|
| - int z = /*info:DownCast*/new B().x;
|
| + String y = /*info:DynamicCast*/new B().x;
|
| + int z = /*info:DynamicCast*/new B().x;
|
| }
|
| '''
|
| }, inferFromOverrides: infer);
|
| @@ -1000,8 +1000,8 @@ void main() {
|
| }
|
|
|
| foo() {
|
| - String y = /*info:DownCast*/new B().x;
|
| - int z = /*info:DownCast*/new B().x;
|
| + String y = /*info:DynamicCast*/new B().x;
|
| + int z = /*info:DynamicCast*/new B().x;
|
| }
|
| '''
|
| }, inferFromOverrides: true);
|
| @@ -1039,12 +1039,12 @@ void main() {
|
| String s;
|
| int i;
|
|
|
| - s = /*info:DownCast*/new B().x;
|
| + s = /*info:DynamicCast*/new B().x;
|
| s = /*severe:StaticTypeError*/new B().y;
|
| s = new B().z;
|
| s = /*severe:StaticTypeError*/new B().w;
|
|
|
| - i = /*info:DownCast*/new B().x;
|
| + i = /*info:DynamicCast*/new B().x;
|
| i = new B().y;
|
| i = /*severe:StaticTypeError*/new B().z;
|
| i = new B().w;
|
|
|