| Index: tests/language/function_type/function_type77_test.dart
|
| diff --git a/tests/language/function_type/function_type77_test.dart b/tests/language/function_type/function_type77_test.dart
|
| index e7984e485167a64d3574d37848c2b1301724cbed..88106267429f8af7c7d5e2fb59e9c6e7ff9d9cbb 100644
|
| --- a/tests/language/function_type/function_type77_test.dart
|
| +++ b/tests/language/function_type/function_type77_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> = Function Function(int y, {Function x});
|
| typedef F1<T> = core.List<core.int> Function(int x0, {int x});
|
| typedef F2<T> = List<T> Function(int x0, {List<T> x});
|
| @@ -33,9 +29,11 @@ typedef F6<T> = int Function(int x1, {List<T> x}) Function(int x);
|
| typedef F7<T> = Function Function(List<Function> x) Function(int x);
|
| typedef F8<T> = Function Function(int y, [List<T> x]) Function(int x);
|
| typedef F9<T> = List<Function> Function([Function x1]) Function(int x);
|
| -typedef F10<T> = List<Function> Function({core.List<core.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 y, {int x}) Function(int x);
|
| -typedef F12<T> = core.List<core.int> Function(int x1, [core.List<core.int> x]) Function(int x);
|
| +typedef F12<T> = core.List<core.int> Function(int x1, [core.List<core.int> x])
|
| + Function(int x);
|
| typedef F13<T> = List<T> Function(int x1) Function(int x);
|
| typedef F14<T> = List<T> Function(int x, [List<Function> x1]) Function(int x);
|
| typedef F15<T> = List<T> Function(int y, {List<T> x}) Function(int x);
|
| @@ -47,7 +45,6 @@ typedef F20<T> = Function Function<A>(core.List<core.int> x) Function(int x);
|
| typedef F21<T> = List<T> Function<A>(List<T> x) Function(int x);
|
| typedef F22<T> = List<A> Function<A>() Function(int x);
|
|
|
| -
|
| Function f0(int y, {Function x}) => null;
|
| core.List<core.int> f1(int x0, {int x}) => null;
|
| List<int> f2(int x0, {List<int> x}) => null;
|
| @@ -60,7 +57,8 @@ Function Function(int y, [List<int> x]) f8(int x) => null;
|
| List<Function> Function([Function x0]) f9(int x) => null;
|
| List<Function> Function({core.List<core.int> x}) f10(int x) => null;
|
| core.List<core.int> Function(int y, {int x}) f11(int x) => null;
|
| -core.List<core.int> Function(int x0, [core.List<core.int> x]) f12(int x) => null;
|
| +core.List<core.int> Function(int x0, [core.List<core.int> x]) f12(int x) =>
|
| + null;
|
| List<int> Function(int x0) f13(int x) => null;
|
| List<int> Function(int x, [List<Function> x0]) f14(int x) => null;
|
| List<int> Function(int y, {List<int> x}) f15(int x) => null;
|
| @@ -72,7 +70,6 @@ Function Function<A>(core.List<core.int> x) f20(int x) => null;
|
| List<int> Function<A>(List<int> x) f21(int x) => null;
|
| List<A> Function<A>() f22(int x) => null;
|
|
|
| -
|
| class U77<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -90,7 +87,8 @@ class U77<T> {
|
| List<Function> Function([Function x1]) Function(int x) x9;
|
| List<Function> Function({core.List<core.int> x}) Function(int x) x10;
|
| core.List<core.int> Function(int y, {int x}) Function(int x) x11;
|
| - core.List<core.int> Function(int x1, [core.List<core.int> x]) Function(int x) x12;
|
| + core.List<core.int> Function(int x1, [core.List<core.int> x]) Function(int x)
|
| + x12;
|
| List<T> Function(int x1) Function(int x) x13;
|
| List<T> Function(int x, [List<Function> x1]) Function(int x) x14;
|
| List<T> Function(int y, {List<T> x}) Function(int x) x15;
|
| @@ -102,7 +100,6 @@ class U77<T> {
|
| List<T> Function<A>(List<T> x) Function(int x) x21;
|
| List<A> Function<A>() Function(int x) x22;
|
|
|
| -
|
| U77({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -118,7 +115,8 @@ class U77<T> {
|
| List<Function> Function([Function x0]) m9(int x) => null;
|
| List<Function> Function({core.List<core.int> x}) m10(int x) => null;
|
| core.List<core.int> Function(int y, {int x}) m11(int x) => null;
|
| - core.List<core.int> Function(int x0, [core.List<core.int> x]) m12(int x) => null;
|
| + core.List<core.int> Function(int x0, [core.List<core.int> x]) m12(int x) =>
|
| + null;
|
| List<T> Function(int x0) m13(int x) => null;
|
| List<T> Function(int x, [List<Function> x0]) m14(int x) => null;
|
| List<T> Function(int y, {List<T> x}) m15(int x) => null;
|
| @@ -130,7 +128,6 @@ class U77<T> {
|
| List<T> Function<A>(List<T> x) m21(int x) => null;
|
| List<A> Function<A>() m22(int x) => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -179,7 +176,6 @@ class U77<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x0, {int x})
|
| @@ -204,7 +200,6 @@ class U77<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// List<T> Function(int x0, {List<T> x})
|
| @@ -237,12 +232,20 @@ class U77<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 x0, {List<T> 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 x0, {List<T> x}) l2 = m2;
|
| // In checked mode, verifies the type.
|
| @@ -273,7 +276,6 @@ class U77<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// int Function(int y, [int x]) Function(int x)
|
| @@ -298,7 +300,6 @@ class U77<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int x2, [List<Function> x3]) Function(int x)
|
| @@ -316,14 +317,14 @@ class U77<T> {
|
| }
|
|
|
| Expect.isTrue(m5 is F5);
|
| - Expect.isTrue(m5 is int Function(int x2, [List<Function> x3]) Function(int x));
|
| + Expect.isTrue(
|
| + m5 is int Function(int x2, [List<Function> x3]) Function(int x));
|
| Expect.isTrue(confuse(m5) is F5);
|
| // In checked mode, verifies the type.
|
| x5 = m5;
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function(int x1, {List<T> x}) Function(int x)
|
| @@ -356,12 +357,20 @@ class U77<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(int x1, {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(int x1, {List<T> x}) Function(int x) l6 = m6;
|
| // In checked mode, verifies the type.
|
| @@ -392,7 +401,6 @@ class U77<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int y, [List<T> x]) Function(int x)
|
| @@ -425,12 +433,20 @@ class U77<T> {
|
| Expect.equals(tIsDynamic, m8 is F8<bool>);
|
| Expect.equals(tIsDynamic, confuse(m8) is F8<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x8 = (f8 as dynamic); });
|
| - Expect.throws(() { x8 = confuse(f8); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x8 = (f8 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x8 = confuse(f8);
|
| + });
|
| Function Function(int y, [List<T> x]) Function(int x) l8;
|
| - Expect.throws(() { l8 = (f8 as dynamic); });
|
| - Expect.throws(() { l8 = confuse(f8); });
|
| + Expect.throws(() {
|
| + l8 = (f8 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l8 = confuse(f8);
|
| + });
|
| }
|
| Function Function(int y, [List<T> x]) Function(int x) l8 = m8;
|
| // In checked mode, verifies the type.
|
| @@ -461,7 +477,6 @@ class U77<T> {
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function({core.List<core.int> x}) Function(int x)
|
| @@ -479,14 +494,14 @@ class U77<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 y, {int x}) Function(int x)
|
| @@ -504,14 +519,14 @@ class U77<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(int y, {int x}) Function(int x));
|
| + Expect.isTrue(
|
| + m11 is core.List<core.int> Function(int y, {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(int x1, [core.List<core.int> x]) Function(int x)
|
| @@ -519,7 +534,8 @@ class U77<T> {
|
| Expect.isTrue(f12 is F12);
|
| Expect.isTrue(confuse(f12) is F12);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int x1, [core.List<core.int> x]) Function(int x) l12;
|
| + core.List<core.int> Function(int x1, [core.List<core.int> x]) Function(
|
| + int x) l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -529,14 +545,15 @@ class U77<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x1, [core.List<core.int> x]) Function(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int x1,
|
| + [core.List<core.int> x])
|
| + 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);
|
| -
|
| }
|
|
|
| /// List<T> Function(int x1) Function(int x)
|
| @@ -569,12 +586,20 @@ class U77<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);
|
| + });
|
| List<T> Function(int x1) 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);
|
| + });
|
| }
|
| List<T> Function(int x1) Function(int x) l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -598,7 +623,8 @@ class U77<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(int x, [List<Function> x1]) Function(int x));
|
| + Expect.isTrue(
|
| + m14 is List<T> Function(int x, [List<Function> x1]) Function(int x));
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -613,12 +639,20 @@ class U77<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, [List<Function> x1]) 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 x, [List<Function> x1]) Function(int x) l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -657,12 +691,20 @@ class U77<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, {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 y, {List<T> x}) Function(int x) l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -693,7 +735,6 @@ class U77<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(List<T> x1) Function(int x)
|
| @@ -726,12 +767,20 @@ class U77<T> {
|
| Expect.equals(tIsDynamic, m17 is F17<bool>);
|
| Expect.equals(tIsDynamic, confuse(m17) is F17<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x17 = (f17 as dynamic); });
|
| - Expect.throws(() { x17 = confuse(f17); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x17 = (f17 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x17 = confuse(f17);
|
| + });
|
| Function(List<T> x1) Function(int x) l17;
|
| - Expect.throws(() { l17 = (f17 as dynamic); });
|
| - Expect.throws(() { l17 = confuse(f17); });
|
| + Expect.throws(() {
|
| + l17 = (f17 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l17 = confuse(f17);
|
| + });
|
| }
|
| Function(List<T> x1) Function(int x) l17 = m17;
|
| // In checked mode, verifies the type.
|
| @@ -762,7 +811,6 @@ class U77<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int x1, {core.List<core.int> x}) Function(int x)
|
| @@ -780,14 +828,14 @@ class U77<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int x1, {core.List<core.int> x}) Function(int x));
|
| + Expect.isTrue(
|
| + m19 is void Function(int x1, {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);
|
| -
|
| }
|
|
|
| /// Function Function<A>(core.List<core.int> x) Function(int x)
|
| @@ -805,14 +853,14 @@ class U77<T> {
|
| }
|
|
|
| Expect.isTrue(m20 is F20);
|
| - Expect.isTrue(m20 is Function Function<A>(core.List<core.int> x) Function(int x));
|
| + Expect.isTrue(
|
| + m20 is Function 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);
|
| -
|
| }
|
|
|
| /// List<T> Function<A>(List<T> x) Function(int x)
|
| @@ -845,12 +893,20 @@ class U77<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);
|
| + });
|
| List<T> 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);
|
| + });
|
| }
|
| List<T> Function<A>(List<T> x) Function(int x) l21 = m21;
|
| // In checked mode, verifies the type.
|
| @@ -881,10 +937,7 @@ class U77<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -892,4 +945,3 @@ void main() {
|
| new U77<int>(tIsInt: true).runTests();
|
| new U77<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|