| Index: tests/language/function_type/function_type16_test.dart
|
| diff --git a/tests/language/function_type/function_type16_test.dart b/tests/language/function_type/function_type16_test.dart
|
| index ddcc96d89cdbfdd0feae6138996bf0d6407427b7..fec44f86c9c30b6019d132f0228bcb0129538209 100644
|
| --- a/tests/language/function_type/function_type16_test.dart
|
| +++ b/tests/language/function_type/function_type16_test.dart
|
| @@ -19,10 +19,6 @@ import 'package:expect/expect.dart';
|
| @AssumeDynamic()
|
| confuse(f) => f;
|
|
|
| -final bool inCheckedMode =
|
| - (() { bool result = false; assert(result = true); return result; })();
|
| -
|
| -
|
| typedef F0<T> = int Function([Function x1]);
|
| typedef F1<T> = List<Function> Function(int x0);
|
| typedef F2<T> = core.List<core.int> Function(List<T> x0);
|
| @@ -48,7 +44,6 @@ typedef F21<T> = List<Function> Function<A>() Function();
|
| typedef F22<T> = Function<A>(A x) Function();
|
| typedef F23<T> = void Function<A>(List<A> x) Function();
|
|
|
| -
|
| int f0([Function x0]) => null;
|
| List<Function> f1(int x0) => null;
|
| core.List<core.int> f2(List<int> x0) => null;
|
| @@ -74,7 +69,6 @@ List<Function> Function<A>() f21() => null;
|
| Function<A>(A x) f22() => null;
|
| void Function<A>(List<A> x) f23() => null;
|
|
|
| -
|
| class U16<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -105,7 +99,6 @@ class U16<T> {
|
| Function<A>(A x) Function() x22;
|
| void Function<A>(List<A> x) Function() x23;
|
|
|
| -
|
| U16({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -134,7 +127,6 @@ class U16<T> {
|
| Function<A>(A x) m22() => null;
|
| void Function<A>(List<A> x) m23() => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -184,7 +176,6 @@ class U16<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x0)
|
| @@ -209,7 +200,6 @@ class U16<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(List<T> x0)
|
| @@ -242,12 +232,20 @@ class U16<T> {
|
| Expect.equals(tIsDynamic, m2 is F2<bool>);
|
| Expect.equals(tIsDynamic, confuse(m2) is F2<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x2 = (f2 as dynamic); });
|
| - Expect.throws(() { x2 = confuse(f2); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x2 = (f2 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x2 = confuse(f2);
|
| + });
|
| core.List<core.int> Function(List<T> x0) l2;
|
| - Expect.throws(() { l2 = (f2 as dynamic); });
|
| - Expect.throws(() { l2 = confuse(f2); });
|
| + Expect.throws(() {
|
| + l2 = (f2 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l2 = confuse(f2);
|
| + });
|
| }
|
| core.List<core.int> Function(List<T> x0) l2 = m2;
|
| // In checked mode, verifies the type.
|
| @@ -278,7 +276,6 @@ class U16<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function<A>(int x)
|
| @@ -303,7 +300,6 @@ class U16<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int x0, [Function x]) Function()
|
| @@ -328,7 +324,6 @@ class U16<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function([core.List<core.int> x1]) Function()
|
| @@ -353,7 +348,6 @@ class U16<T> {
|
| l6 = m6;
|
| x6 = confuse(m6);
|
| l6 = confuse(m6);
|
| -
|
| }
|
|
|
| /// Function Function(int x, [int x2]) Function()
|
| @@ -378,7 +372,6 @@ class U16<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int y, {List<Function> x}) Function()
|
| @@ -396,14 +389,14 @@ class U16<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int y, {List<Function> x}) Function());
|
| + Expect
|
| + .isTrue(m8 is Function Function(int y, {List<Function> x}) Function());
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| l8 = m8;
|
| x8 = confuse(m8);
|
| l8 = confuse(m8);
|
| -
|
| }
|
|
|
| /// List<Function> Function([int x]) Function()
|
| @@ -428,7 +421,6 @@ class U16<T> {
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function(List<Function> x0) Function()
|
| @@ -453,7 +445,6 @@ class U16<T> {
|
| l10 = m10;
|
| x10 = confuse(m10);
|
| l10 = confuse(m10);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x, [List<T> x2]) Function()
|
| @@ -471,7 +462,8 @@ class U16<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is List<Function> Function(int x, [List<T> x2]) Function());
|
| + Expect
|
| + .isTrue(m11 is List<Function> Function(int x, [List<T> x2]) Function());
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -486,12 +478,20 @@ class U16<T> {
|
| Expect.equals(tIsDynamic, m11 is F11<bool>);
|
| Expect.equals(tIsDynamic, confuse(m11) is F11<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x11 = (f11 as dynamic); });
|
| - Expect.throws(() { x11 = confuse(f11); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x11 = (f11 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x11 = confuse(f11);
|
| + });
|
| List<Function> Function(int x, [List<T> x2]) Function() l11;
|
| - Expect.throws(() { l11 = (f11 as dynamic); });
|
| - Expect.throws(() { l11 = confuse(f11); });
|
| + Expect.throws(() {
|
| + l11 = (f11 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l11 = confuse(f11);
|
| + });
|
| }
|
| List<Function> Function(int x, [List<T> x2]) Function() l11 = m11;
|
| // In checked mode, verifies the type.
|
| @@ -515,14 +515,14 @@ class U16<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x0, {Function x}) Function());
|
| + Expect.isTrue(
|
| + m12 is core.List<core.int> Function(int x0, {Function x}) Function());
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| l12 = m12;
|
| x12 = confuse(m12);
|
| l12 = confuse(m12);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function([List<T> x]) Function()
|
| @@ -555,12 +555,20 @@ class U16<T> {
|
| Expect.equals(tIsDynamic, m13 is F13<bool>);
|
| Expect.equals(tIsDynamic, confuse(m13) is F13<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x13 = (f13 as dynamic); });
|
| - Expect.throws(() { x13 = confuse(f13); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x13 = (f13 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x13 = confuse(f13);
|
| + });
|
| core.List<core.int> Function([List<T> x]) Function() l13;
|
| - Expect.throws(() { l13 = (f13 as dynamic); });
|
| - Expect.throws(() { l13 = confuse(f13); });
|
| + Expect.throws(() {
|
| + l13 = (f13 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l13 = confuse(f13);
|
| + });
|
| }
|
| core.List<core.int> Function([List<T> x]) Function() l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -599,12 +607,20 @@ class U16<T> {
|
| Expect.equals(tIsDynamic, m14 is F14<bool>);
|
| Expect.equals(tIsDynamic, confuse(m14) is F14<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x14 = (f14 as dynamic); });
|
| - Expect.throws(() { x14 = confuse(f14); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x14 = (f14 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x14 = confuse(f14);
|
| + });
|
| List<T> Function(int y, [Function x]) Function() l14;
|
| - Expect.throws(() { l14 = (f14 as dynamic); });
|
| - Expect.throws(() { l14 = confuse(f14); });
|
| + Expect.throws(() {
|
| + l14 = (f14 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l14 = confuse(f14);
|
| + });
|
| }
|
| List<T> Function(int y, [Function x]) Function() l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -628,7 +644,8 @@ class U16<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int x1, [core.List<core.int> x2]) Function());
|
| + Expect.isTrue(
|
| + m15 is List<T> Function(int x1, [core.List<core.int> x2]) Function());
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -643,12 +660,20 @@ class U16<T> {
|
| Expect.equals(tIsDynamic, m15 is F15<bool>);
|
| Expect.equals(tIsDynamic, confuse(m15) is F15<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x15 = (f15 as dynamic); });
|
| - Expect.throws(() { x15 = confuse(f15); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x15 = (f15 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x15 = confuse(f15);
|
| + });
|
| List<T> Function(int x1, [core.List<core.int> x2]) Function() l15;
|
| - Expect.throws(() { l15 = (f15 as dynamic); });
|
| - Expect.throws(() { l15 = confuse(f15); });
|
| + Expect.throws(() {
|
| + l15 = (f15 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l15 = confuse(f15);
|
| + });
|
| }
|
| List<T> Function(int x1, [core.List<core.int> x2]) Function() l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -679,7 +704,6 @@ class U16<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(core.List<core.int> x) Function()
|
| @@ -704,7 +728,6 @@ class U16<T> {
|
| l17 = m17;
|
| x17 = confuse(m17);
|
| l17 = confuse(m17);
|
| -
|
| }
|
|
|
| /// void Function(int x0, [int x]) Function()
|
| @@ -729,7 +752,6 @@ class U16<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function([List<Function> x1]) Function()
|
| @@ -754,7 +776,6 @@ class U16<T> {
|
| l19 = m19;
|
| x19 = confuse(m19);
|
| l19 = confuse(m19);
|
| -
|
| }
|
|
|
| /// void Function({List<T> x}) Function()
|
| @@ -787,12 +808,20 @@ class U16<T> {
|
| Expect.equals(tIsDynamic, m20 is F20<bool>);
|
| Expect.equals(tIsDynamic, confuse(m20) is F20<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x20 = (f20 as dynamic); });
|
| - Expect.throws(() { x20 = confuse(f20); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x20 = (f20 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x20 = confuse(f20);
|
| + });
|
| void Function({List<T> x}) Function() l20;
|
| - Expect.throws(() { l20 = (f20 as dynamic); });
|
| - Expect.throws(() { l20 = confuse(f20); });
|
| + Expect.throws(() {
|
| + l20 = (f20 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l20 = confuse(f20);
|
| + });
|
| }
|
| void Function({List<T> x}) Function() l20 = m20;
|
| // In checked mode, verifies the type.
|
| @@ -823,7 +852,6 @@ class U16<T> {
|
| l21 = m21;
|
| x21 = confuse(m21);
|
| l21 = confuse(m21);
|
| -
|
| }
|
|
|
| /// Function<A>(A x) Function()
|
| @@ -848,7 +876,6 @@ class U16<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
|
|
| /// void Function<A>(List<A> x) Function()
|
| @@ -873,10 +900,7 @@ class U16<T> {
|
| l23 = m23;
|
| x23 = confuse(m23);
|
| l23 = confuse(m23);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -884,4 +908,3 @@ void main() {
|
| new U16<int>(tIsInt: true).runTests();
|
| new U16<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|