| Index: tests/language/function_type/function_type32_test.dart
|
| diff --git a/tests/language/function_type/function_type32_test.dart b/tests/language/function_type/function_type32_test.dart
|
| index 2cfa6fa75a986c4389c30f72ddfe7312d578b85f..83264d9790bfa68212bcc56a5523d3b4fb2ca33a 100644
|
| --- a/tests/language/function_type/function_type32_test.dart
|
| +++ b/tests/language/function_type/function_type32_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 y, {List<Function> x});
|
| typedef F1<T> = List<Function> Function(int x0, {Function x});
|
| typedef F2<T> = List<T> Function({int x});
|
| @@ -35,7 +31,8 @@ typedef F8<T> = Function Function(int y, [core.List<core.int> x]) Function();
|
| typedef F9<T> = List<Function> Function([int x1]) Function();
|
| typedef F10<T> = List<Function> Function({List<Function> x}) Function();
|
| typedef F11<T> = List<Function> Function() Function();
|
| -typedef F12<T> = core.List<core.int> Function(int x0, [List<Function> x]) Function();
|
| +typedef F12<T> = core.List<core.int> Function(int x0, [List<Function> x])
|
| + Function();
|
| typedef F13<T> = core.List<core.int> Function([List<T> x1]) Function();
|
| typedef F14<T> = List<T> Function(int x, [Function x2]) Function();
|
| typedef F15<T> = List<T> Function(int y, {core.List<core.int> x}) Function();
|
| @@ -48,7 +45,6 @@ typedef F21<T> = core.List<core.int> Function<A>(Function x) Function();
|
| typedef F22<T> = A Function<A>(List<Function> x) Function();
|
| typedef F23<T> = B Function(B x) Function<B extends core.int>();
|
|
|
| -
|
| int f0(int y, {List<Function> x}) => null;
|
| List<Function> f1(int x0, {Function x}) => null;
|
| List<int> f2({int x}) => null;
|
| @@ -74,7 +70,6 @@ core.List<core.int> Function<A>(Function x) f21() => null;
|
| A Function<A>(List<Function> x) f22() => null;
|
| B Function(B x) f23<B extends core.int>() => null;
|
|
|
| -
|
| class U32<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -105,7 +100,6 @@ class U32<T> {
|
| A Function<A>(List<Function> x) Function() x22;
|
| B Function(B x) Function<B extends core.int>() x23;
|
|
|
| -
|
| U32({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -134,7 +128,6 @@ class U32<T> {
|
| A Function<A>(List<Function> x) m22() => null;
|
| B Function(B x) m23<B extends core.int>() => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -184,7 +177,6 @@ class U32<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x0, {Function x})
|
| @@ -209,7 +201,6 @@ class U32<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// List<T> Function({int x})
|
| @@ -242,12 +233,20 @@ class U32<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);
|
| + });
|
| List<T> Function({int x}) l2;
|
| - Expect.throws(() { l2 = (f2 as dynamic); });
|
| - Expect.throws(() { l2 = confuse(f2); });
|
| + Expect.throws(() {
|
| + l2 = (f2 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l2 = confuse(f2);
|
| + });
|
| }
|
| List<T> Function({int x}) l2 = m2;
|
| // In checked mode, verifies the type.
|
| @@ -286,12 +285,20 @@ class U32<T> {
|
| Expect.equals(tIsDynamic, m3 is F3<bool>);
|
| Expect.equals(tIsDynamic, confuse(m3) is F3<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x3 = (f3 as dynamic); });
|
| - Expect.throws(() { x3 = confuse(f3); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x3 = (f3 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x3 = confuse(f3);
|
| + });
|
| Function({List<T> x}) l3;
|
| - Expect.throws(() { l3 = (f3 as dynamic); });
|
| - Expect.throws(() { l3 = confuse(f3); });
|
| + Expect.throws(() {
|
| + l3 = (f3 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l3 = confuse(f3);
|
| + });
|
| }
|
| Function({List<T> x}) l3 = m3;
|
| // In checked mode, verifies the type.
|
| @@ -322,7 +329,6 @@ class U32<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int x1, [Function x2]) Function()
|
| @@ -347,7 +353,6 @@ class U32<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function(int x0, {core.List<core.int> x}) Function()
|
| @@ -365,14 +370,14 @@ class U32<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int x0, {core.List<core.int> x}) Function());
|
| + Expect
|
| + .isTrue(m6 is int Function(int x0, {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(Function x) Function()
|
| @@ -397,7 +402,6 @@ class U32<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int y, [core.List<core.int> x]) Function()
|
| @@ -415,14 +419,14 @@ class U32<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int y, [core.List<core.int> x]) Function());
|
| + Expect.isTrue(
|
| + m8 is Function Function(int y, [core.List<core.int> 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 x1]) Function()
|
| @@ -447,7 +451,6 @@ class U32<T> {
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function({List<Function> x}) Function()
|
| @@ -465,14 +468,14 @@ class U32<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function({List<Function> x}) Function());
|
| + Expect
|
| + .isTrue(m10 is List<Function> Function({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() Function()
|
| @@ -497,7 +500,6 @@ class U32<T> {
|
| l11 = m11;
|
| x11 = confuse(m11);
|
| l11 = confuse(m11);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x0, [List<Function> x]) Function()
|
| @@ -515,14 +517,14 @@ class U32<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x0, [List<Function> x]) Function());
|
| + Expect.isTrue(m12
|
| + is core.List<core.int> Function(int x0, [List<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> x1]) Function()
|
| @@ -555,12 +557,20 @@ class U32<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> x1]) 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> x1]) Function() l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -599,12 +609,20 @@ class U32<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 x, [Function x2]) 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 x, [Function x2]) Function() l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -628,7 +646,8 @@ class U32<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int y, {core.List<core.int> x}) Function());
|
| + Expect.isTrue(
|
| + m15 is List<T> Function(int y, {core.List<core.int> x}) Function());
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -643,12 +662,20 @@ class U32<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 y, {core.List<core.int> x}) 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 y, {core.List<core.int> x}) Function() l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -679,7 +706,6 @@ class U32<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(core.List<core.int> x0) Function()
|
| @@ -704,7 +730,6 @@ class U32<T> {
|
| l17 = m17;
|
| x17 = confuse(m17);
|
| l17 = confuse(m17);
|
| -
|
| }
|
|
|
| /// void Function(int x1, [int x2]) Function()
|
| @@ -729,7 +754,6 @@ class U32<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int x0, {List<Function> x}) Function()
|
| @@ -754,7 +778,6 @@ class U32<T> {
|
| l19 = m19;
|
| x19 = confuse(m19);
|
| l19 = confuse(m19);
|
| -
|
| }
|
|
|
| /// int Function<A>(int x) Function()
|
| @@ -779,7 +802,6 @@ class U32<T> {
|
| l20 = m20;
|
| x20 = confuse(m20);
|
| l20 = confuse(m20);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function<A>(Function x) Function()
|
| @@ -797,14 +819,14 @@ class U32<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is core.List<core.int> Function<A>(Function x) Function());
|
| + Expect
|
| + .isTrue(m21 is core.List<core.int> Function<A>(Function x) Function());
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
| l21 = m21;
|
| x21 = confuse(m21);
|
| l21 = confuse(m21);
|
| -
|
| }
|
|
|
| /// A Function<A>(List<Function> x) Function()
|
| @@ -829,7 +851,6 @@ class U32<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
|
|
| /// B Function(B x) Function<B extends core.int>()
|
| @@ -854,10 +875,7 @@ class U32<T> {
|
| l23 = m23;
|
| x23 = confuse(m23);
|
| l23 = confuse(m23);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -865,4 +883,3 @@ void main() {
|
| new U32<int>(tIsInt: true).runTests();
|
| new U32<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|