| Index: tests/language/function_type/function_type45_test.dart
|
| diff --git a/tests/language/function_type/function_type45_test.dart b/tests/language/function_type/function_type45_test.dart
|
| index c1b4726da32d604260ae0a64880dd7f544ee456b..0f3d8205f1c94d3c9b55b8cf6392859a9b25f5eb 100644
|
| --- a/tests/language/function_type/function_type45_test.dart
|
| +++ b/tests/language/function_type/function_type45_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([List<T> x]);
|
| typedef F1<T> = List<Function> Function(core.List<core.int> x);
|
| typedef F2<T> = List<T> Function(int y, {Function x});
|
| @@ -31,11 +27,13 @@ typedef F4<T> = A Function<A>();
|
| typedef F5<T> = int Function(int x1, {Function x}) Function(int x);
|
| typedef F6<T> = int Function([List<T> x]) Function(int x);
|
| typedef F7<T> = Function Function(int y, [Function x]) Function(int x);
|
| -typedef F8<T> = Function Function(int x2, [core.List<core.int> x3]) Function(int x);
|
| +typedef F8<T> = Function Function(int x2, [core.List<core.int> x3]) Function(
|
| + int x);
|
| typedef F9<T> = List<Function> Function({int x}) Function(int x);
|
| typedef F10<T> = List<Function> Function(core.List<core.int> x) Function(int x);
|
| typedef F11<T> = core.List<core.int> Function(int x1, [int x]) Function(int x);
|
| -typedef F12<T> = core.List<core.int> Function([List<Function> x1]) Function(int x);
|
| +typedef F12<T> = core.List<core.int> Function([List<Function> x1]) Function(
|
| + int x);
|
| typedef F13<T> = core.List<core.int> Function({List<T> x}) Function(int x);
|
| typedef F14<T> = List<T> Function(int y, {Function x}) Function(int x);
|
| typedef F15<T> = List<T> Function(int x1, [List<T> x]) Function(int x);
|
| @@ -46,8 +44,8 @@ typedef F19<T> = void Function([core.List<core.int> x]) Function(int x);
|
| typedef F20<T> = int Function<A>(core.List<core.int> x) Function(int x);
|
| typedef F21<T> = core.List<core.int> Function<A>(List<T> x) Function(int x);
|
| typedef F22<T> = A Function<A>() Function(int x);
|
| -typedef F23<T> = B Function(core.List<core.int> x) Function<B extends core.int>(int x);
|
| -
|
| +typedef F23<T> = B Function(core.List<core.int> x) Function<B extends core.int>(
|
| + int x);
|
|
|
| int f0([List<int> x]) => null;
|
| List<Function> f1(core.List<core.int> x) => null;
|
| @@ -74,7 +72,6 @@ core.List<core.int> Function<A>(List<int> x) f21(int x) => null;
|
| A Function<A>() f22(int x) => null;
|
| B Function(core.List<core.int> x) f23<B extends core.int>(int x) => null;
|
|
|
| -
|
| class U45<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -105,7 +102,6 @@ class U45<T> {
|
| A Function<A>() Function(int x) x22;
|
| B Function(core.List<core.int> x) Function<B extends core.int>(int x) x23;
|
|
|
| -
|
| U45({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -134,7 +130,6 @@ class U45<T> {
|
| A Function<A>() m22(int x) => null;
|
| B Function(core.List<core.int> x) m23<B extends core.int>(int x) => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -192,12 +187,20 @@ class U45<T> {
|
| Expect.equals(tIsDynamic, m0 is F0<bool>);
|
| Expect.equals(tIsDynamic, confuse(m0) is F0<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x0 = (f0 as dynamic); });
|
| - Expect.throws(() { x0 = confuse(f0); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x0 = (f0 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x0 = confuse(f0);
|
| + });
|
| int Function([List<T> x]) l0;
|
| - Expect.throws(() { l0 = (f0 as dynamic); });
|
| - Expect.throws(() { l0 = confuse(f0); });
|
| + Expect.throws(() {
|
| + l0 = (f0 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l0 = confuse(f0);
|
| + });
|
| }
|
| int Function([List<T> x]) l0 = m0;
|
| // In checked mode, verifies the type.
|
| @@ -228,7 +231,6 @@ class U45<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// List<T> Function(int y, {Function x})
|
| @@ -261,12 +263,20 @@ class U45<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 y, {Function 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 y, {Function x}) l2 = m2;
|
| // In checked mode, verifies the type.
|
| @@ -297,7 +307,6 @@ class U45<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// A Function<A>()
|
| @@ -322,7 +331,6 @@ class U45<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int x1, {Function x}) Function(int x)
|
| @@ -347,7 +355,6 @@ class U45<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function([List<T> x]) Function(int x)
|
| @@ -380,12 +387,20 @@ class U45<T> {
|
| Expect.equals(tIsDynamic, m6 is F6<bool>);
|
| Expect.equals(tIsDynamic, confuse(m6) is F6<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x6 = (f6 as dynamic); });
|
| - Expect.throws(() { x6 = confuse(f6); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x6 = (f6 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x6 = confuse(f6);
|
| + });
|
| int Function([List<T> x]) Function(int x) l6;
|
| - Expect.throws(() { l6 = (f6 as dynamic); });
|
| - Expect.throws(() { l6 = confuse(f6); });
|
| + Expect.throws(() {
|
| + l6 = (f6 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l6 = confuse(f6);
|
| + });
|
| }
|
| int Function([List<T> x]) Function(int x) l6 = m6;
|
| // In checked mode, verifies the type.
|
| @@ -416,7 +431,6 @@ class U45<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int x2, [core.List<core.int> x3]) Function(int x)
|
| @@ -434,14 +448,14 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int x2, [core.List<core.int> x3]) Function(int x));
|
| + Expect.isTrue(m8 is Function Function(int x2, [core.List<core.int> x3])
|
| + Function(int x));
|
| 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(int x)
|
| @@ -466,7 +480,6 @@ class U45<T> {
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function(core.List<core.int> x) Function(int x)
|
| @@ -484,14 +497,14 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(core.List<core.int> x) Function(int x));
|
| + Expect.isTrue(
|
| + m10 is List<Function> Function(core.List<core.int> x) Function(int x));
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| l10 = m10;
|
| x10 = confuse(m10);
|
| l10 = confuse(m10);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x1, [int x]) Function(int x)
|
| @@ -509,14 +522,14 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(int x1, [int x]) Function(int x));
|
| + Expect.isTrue(
|
| + m11 is core.List<core.int> Function(int x1, [int x]) Function(int x));
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| l11 = m11;
|
| x11 = confuse(m11);
|
| l11 = confuse(m11);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function([List<Function> x1]) Function(int x)
|
| @@ -534,14 +547,14 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function([List<Function> x1]) Function(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function([List<Function> x1])
|
| + Function(int x));
|
| 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(int x)
|
| @@ -559,7 +572,8 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function({List<T> x}) Function(int x));
|
| + Expect.isTrue(
|
| + m13 is core.List<core.int> Function({List<T> x}) Function(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -574,12 +588,20 @@ class U45<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(int x) 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(int x) l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -618,12 +640,20 @@ class U45<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(int x) 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(int x) l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -662,12 +692,20 @@ class U45<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, [List<T> x]) Function(int x) 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, [List<T> x]) Function(int x) l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -698,7 +736,6 @@ class U45<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(int x, [core.List<core.int> x1]) Function(int x)
|
| @@ -716,14 +753,14 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m17 is F17);
|
| - Expect.isTrue(m17 is Function(int x, [core.List<core.int> x1]) Function(int x));
|
| + Expect.isTrue(
|
| + m17 is Function(int x, [core.List<core.int> x1]) Function(int x));
|
| Expect.isTrue(confuse(m17) is F17);
|
| // In checked mode, verifies the type.
|
| x17 = m17;
|
| l17 = m17;
|
| x17 = confuse(m17);
|
| l17 = confuse(m17);
|
| -
|
| }
|
|
|
| /// void Function(int x1, {int x}) Function(int x)
|
| @@ -748,7 +785,6 @@ class U45<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function([core.List<core.int> x]) Function(int x)
|
| @@ -766,14 +802,14 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function([core.List<core.int> x]) Function(int x));
|
| + Expect
|
| + .isTrue(m19 is void Function([core.List<core.int> x]) Function(int x));
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| l19 = m19;
|
| x19 = confuse(m19);
|
| l19 = confuse(m19);
|
| -
|
| }
|
|
|
| /// int Function<A>(core.List<core.int> x) Function(int x)
|
| @@ -791,14 +827,14 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m20 is F20);
|
| - Expect.isTrue(m20 is int Function<A>(core.List<core.int> x) Function(int x));
|
| + Expect
|
| + .isTrue(m20 is int Function<A>(core.List<core.int> x) Function(int x));
|
| Expect.isTrue(confuse(m20) is F20);
|
| // In checked mode, verifies the type.
|
| x20 = m20;
|
| l20 = m20;
|
| x20 = confuse(m20);
|
| l20 = confuse(m20);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function<A>(List<T> x) Function(int x)
|
| @@ -816,7 +852,8 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is core.List<core.int> Function<A>(List<T> x) Function(int x));
|
| + Expect.isTrue(
|
| + m21 is core.List<core.int> Function<A>(List<T> x) Function(int x));
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
| @@ -831,12 +868,20 @@ class U45<T> {
|
| Expect.equals(tIsDynamic, m21 is F21<bool>);
|
| Expect.equals(tIsDynamic, confuse(m21) is F21<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x21 = (f21 as dynamic); });
|
| - Expect.throws(() { x21 = confuse(f21); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x21 = (f21 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x21 = confuse(f21);
|
| + });
|
| core.List<core.int> Function<A>(List<T> x) Function(int x) l21;
|
| - Expect.throws(() { l21 = (f21 as dynamic); });
|
| - Expect.throws(() { l21 = confuse(f21); });
|
| + Expect.throws(() {
|
| + l21 = (f21 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l21 = confuse(f21);
|
| + });
|
| }
|
| core.List<core.int> Function<A>(List<T> x) Function(int x) l21 = m21;
|
| // In checked mode, verifies the type.
|
| @@ -867,7 +912,6 @@ class U45<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
|
|
| /// B Function(core.List<core.int> x) Function<B extends core.int>(int x)
|
| @@ -885,17 +929,15 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m23 is F23);
|
| - Expect.isTrue(m23 is B Function(core.List<core.int> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m23 is B Function(core.List<core.int> x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m23) is F23);
|
| // In checked mode, verifies the type.
|
| x23 = m23;
|
| l23 = m23;
|
| x23 = confuse(m23);
|
| l23 = confuse(m23);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -903,4 +945,3 @@ void main() {
|
| new U45<int>(tIsInt: true).runTests();
|
| new U45<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|