| Index: tests/language/function_type/function_type8_test.dart
|
| diff --git a/tests/language/function_type/function_type8_test.dart b/tests/language/function_type/function_type8_test.dart
|
| index 065398d69c5802ca8179530d82309fdf3e8d1403..a0b0a1101e1c1d4e4252f5bcf66dc9bac6f01334 100644
|
| --- a/tests/language/function_type/function_type8_test.dart
|
| +++ b/tests/language/function_type/function_type8_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({int x});
|
| typedef F1<T> = Function Function({List<T> x});
|
| typedef F2<T> = core.List<core.int> Function(int x, [core.List<core.int> x2]);
|
| @@ -36,7 +32,8 @@ typedef F9<T> = Function Function() Function();
|
| typedef F10<T> = List<Function> Function(int x0, [List<Function> x]) Function();
|
| typedef F11<T> = List<Function> Function([List<T> x1]) Function();
|
| typedef F12<T> = core.List<core.int> Function(int x, [Function x2]) Function();
|
| -typedef F13<T> = core.List<core.int> Function(int y, {core.List<core.int> x}) Function();
|
| +typedef F13<T> = core.List<core.int> Function(int y, {core.List<core.int> x})
|
| + Function();
|
| typedef F14<T> = List<T> Function([Function x]) Function();
|
| typedef F15<T> = List<T> Function(core.List<core.int> x0) Function();
|
| typedef F16<T> = Function(int x1, [int x2]) Function();
|
| @@ -48,7 +45,6 @@ typedef F21<T> = List<Function> Function<A>(core.List<core.int> x) Function();
|
| typedef F22<T> = Function<A>(List<T> x) Function();
|
| typedef F23<T> = void Function<A>() Function();
|
|
|
| -
|
| int f0({int x}) => null;
|
| Function f1({List<int> x}) => null;
|
| core.List<core.int> f2(int x, [core.List<core.int> x0]) => null;
|
| @@ -74,7 +70,6 @@ List<Function> Function<A>(core.List<core.int> x) f21() => null;
|
| Function<A>(List<int> x) f22() => null;
|
| void Function<A>() f23() => null;
|
|
|
| -
|
| class U8<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -105,7 +100,6 @@ class U8<T> {
|
| Function<A>(List<T> x) Function() x22;
|
| void Function<A>() Function() x23;
|
|
|
| -
|
| U8({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -134,7 +128,6 @@ class U8<T> {
|
| Function<A>(List<T> x) m22() => null;
|
| void Function<A>() m23() => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -184,7 +177,6 @@ class U8<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// Function Function({List<T> x})
|
| @@ -217,12 +209,20 @@ class U8<T> {
|
| Expect.equals(tIsDynamic, m1 is F1<bool>);
|
| Expect.equals(tIsDynamic, confuse(m1) is F1<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x1 = (f1 as dynamic); });
|
| - Expect.throws(() { x1 = confuse(f1); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x1 = (f1 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x1 = confuse(f1);
|
| + });
|
| Function Function({List<T> x}) l1;
|
| - Expect.throws(() { l1 = (f1 as dynamic); });
|
| - Expect.throws(() { l1 = confuse(f1); });
|
| + Expect.throws(() {
|
| + l1 = (f1 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l1 = confuse(f1);
|
| + });
|
| }
|
| Function Function({List<T> x}) l1 = m1;
|
| // In checked mode, verifies the type.
|
| @@ -246,14 +246,14 @@ class U8<T> {
|
| }
|
|
|
| Expect.isTrue(m2 is F2);
|
| - Expect.isTrue(m2 is core.List<core.int> Function(int x, [core.List<core.int> x2]));
|
| + Expect.isTrue(
|
| + m2 is core.List<core.int> Function(int x, [core.List<core.int> x2]));
|
| Expect.isTrue(confuse(m2) is F2);
|
| // In checked mode, verifies the type.
|
| x2 = m2;
|
| l2 = m2;
|
| x2 = confuse(m2);
|
| l2 = confuse(m2);
|
| -
|
| }
|
|
|
| /// Function(int x1, [List<Function> x2])
|
| @@ -278,7 +278,6 @@ class U8<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// List<Function> Function<A>(int x)
|
| @@ -303,7 +302,6 @@ class U8<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(Function x) Function()
|
| @@ -328,7 +326,6 @@ class U8<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function(int y, [core.List<core.int> x]) Function()
|
| @@ -346,14 +343,14 @@ class U8<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int y, [core.List<core.int> x]) Function());
|
| + Expect
|
| + .isTrue(m6 is int Function(int y, [core.List<core.int> x]) Function());
|
| Expect.isTrue(confuse(m6) is F6);
|
| // In checked mode, verifies the type.
|
| x6 = m6;
|
| l6 = m6;
|
| x6 = confuse(m6);
|
| l6 = confuse(m6);
|
| -
|
| }
|
|
|
| /// Function Function([int x1]) Function()
|
| @@ -378,7 +375,6 @@ class U8<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function({List<Function> x}) Function()
|
| @@ -403,7 +399,6 @@ class U8<T> {
|
| l8 = m8;
|
| x8 = confuse(m8);
|
| l8 = confuse(m8);
|
| -
|
| }
|
|
|
| /// Function Function() Function()
|
| @@ -428,7 +423,6 @@ class U8<T> {
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x0, [List<Function> x]) Function()
|
| @@ -446,14 +440,14 @@ class U8<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(int x0, [List<Function> x]) Function());
|
| + Expect.isTrue(
|
| + m10 is List<Function> Function(int x0, [List<Function> x]) Function());
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| l10 = m10;
|
| x10 = confuse(m10);
|
| l10 = confuse(m10);
|
| -
|
| }
|
|
|
| /// List<Function> Function([List<T> x1]) Function()
|
| @@ -486,12 +480,20 @@ class U8<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([List<T> x1]) 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([List<T> x1]) Function() l11 = m11;
|
| // In checked mode, verifies the type.
|
| @@ -515,14 +517,14 @@ class U8<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x, [Function x2]) Function());
|
| + Expect.isTrue(
|
| + m12 is core.List<core.int> Function(int x, [Function x2]) 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(int y, {core.List<core.int> x}) Function()
|
| @@ -540,14 +542,15 @@ class U8<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(int y, {core.List<core.int> x}) Function());
|
| + Expect.isTrue(m13 is core.List<core.int> Function(int y,
|
| + {core.List<core.int> x})
|
| + Function());
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| l13 = m13;
|
| x13 = confuse(m13);
|
| l13 = confuse(m13);
|
| -
|
| }
|
|
|
| /// List<T> Function([Function x]) Function()
|
| @@ -580,12 +583,20 @@ class U8<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([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([Function x]) Function() l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -624,12 +635,20 @@ class U8<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(core.List<core.int> x0) 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(core.List<core.int> x0) Function() l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -660,7 +679,6 @@ class U8<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(int x0, {List<Function> x}) Function()
|
| @@ -685,7 +703,6 @@ class U8<T> {
|
| l17 = m17;
|
| x17 = confuse(m17);
|
| l17 = confuse(m17);
|
| -
|
| }
|
|
|
| /// void Function(int x) Function()
|
| @@ -710,7 +727,6 @@ class U8<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int y, [List<Function> x]) Function()
|
| @@ -735,7 +751,6 @@ class U8<T> {
|
| l19 = m19;
|
| x19 = confuse(m19);
|
| l19 = confuse(m19);
|
| -
|
| }
|
|
|
| /// void Function(int x1, [List<T> x2]) Function()
|
| @@ -768,12 +783,20 @@ class U8<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(int x1, [List<T> x2]) 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(int x1, [List<T> x2]) Function() l20 = m20;
|
| // In checked mode, verifies the type.
|
| @@ -797,14 +820,14 @@ class U8<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is List<Function> Function<A>(core.List<core.int> x) Function());
|
| + Expect.isTrue(
|
| + m21 is List<Function> Function<A>(core.List<core.int> x) Function());
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
| l21 = m21;
|
| x21 = confuse(m21);
|
| l21 = confuse(m21);
|
| -
|
| }
|
|
|
| /// Function<A>(List<T> x) Function()
|
| @@ -837,12 +860,20 @@ class U8<T> {
|
| Expect.equals(tIsDynamic, m22 is F22<bool>);
|
| Expect.equals(tIsDynamic, confuse(m22) is F22<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x22 = (f22 as dynamic); });
|
| - Expect.throws(() { x22 = confuse(f22); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x22 = (f22 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x22 = confuse(f22);
|
| + });
|
| Function<A>(List<T> x) Function() l22;
|
| - Expect.throws(() { l22 = (f22 as dynamic); });
|
| - Expect.throws(() { l22 = confuse(f22); });
|
| + Expect.throws(() {
|
| + l22 = (f22 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l22 = confuse(f22);
|
| + });
|
| }
|
| Function<A>(List<T> x) Function() l22 = m22;
|
| // In checked mode, verifies the type.
|
| @@ -873,10 +904,7 @@ class U8<T> {
|
| l23 = m23;
|
| x23 = confuse(m23);
|
| l23 = confuse(m23);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -884,4 +912,3 @@ void main() {
|
| new U8<int>(tIsInt: true).runTests();
|
| new U8<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|