| Index: tests/language/function_type/function_type24_test.dart
|
| diff --git a/tests/language/function_type/function_type24_test.dart b/tests/language/function_type/function_type24_test.dart
|
| index 0c86c1ccc7f445805d172e71da986894412e84b0..7c69e0eeaae248ea036ba40c1e436b84fba8fda2 100644
|
| --- a/tests/language/function_type/function_type24_test.dart
|
| +++ b/tests/language/function_type/function_type24_test.dart
|
| @@ -19,35 +19,60 @@ 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 x0, [List<Function> x]);
|
| -typedef F1<T> = List<Function> Function([Function x]);
|
| -typedef F2<T> = List<T> Function(int x);
|
| -typedef F3<T> = Function(List<T> x);
|
| -typedef F4<T> = List<T> Function<A>(int x);
|
| -typedef F5<T> = int Function(Function x0) Function();
|
| -typedef F6<T> = int Function(int x, [core.List<core.int> x2]) Function();
|
| -typedef F7<T> = Function Function(int x0, {int x}) Function();
|
| -typedef F8<T> = Function Function([core.List<core.int> x]) Function();
|
| -typedef F9<T> = List<Function> Function(int y, [int x]) Function();
|
| -typedef F10<T> = List<Function> Function(int x1, [List<Function> x2]) Function();
|
| -typedef F11<T> = List<Function> Function(int x0, {List<T> x}) Function();
|
| -typedef F12<T> = core.List<core.int> Function(List<Function> x) Function();
|
| -typedef F13<T> = core.List<core.int> Function(int y, [List<T> x]) Function();
|
| -typedef F14<T> = List<T> Function([Function x1]) Function();
|
| -typedef F15<T> = List<T> Function({core.List<core.int> x}) Function();
|
| -typedef F16<T> = Function(int y, {int x}) Function();
|
| -typedef F17<T> = Function(int x0, [core.List<core.int> x]) Function();
|
| -typedef F18<T> = void Function(int x0) Function();
|
| -typedef F19<T> = void Function(int x, [List<Function> x2]) Function();
|
| -typedef F20<T> = void Function(int y, {List<T> x}) Function();
|
| -typedef F21<T> = List<Function> Function<A>(List<A> x) Function();
|
| -typedef F22<T> = A Function<A>(int x) Function();
|
| -typedef F23<T> = List<Function> Function(B x) Function<B extends core.int>();
|
| -
|
| +final bool inCheckedMode = (() {
|
| + bool result = false;
|
| + assert(result = true);
|
| + return result;
|
| +})();
|
| +
|
| +typedef F0<T>
|
| + = int Function(int x0, [List<Function> x]);
|
| +typedef F1<T>
|
| + = List<Function> Function([Function x]);
|
| +typedef F2<T>
|
| + = List<T> Function(int x);
|
| +typedef F3<T>
|
| + = Function(List<T> x);
|
| +typedef F4<T>
|
| + = List<T> Function<A>(int x);
|
| +typedef F5<T>
|
| + = int Function(Function x0) Function();
|
| +typedef F6<T>
|
| + = int Function(int x, [core.List<core.int> x2]) Function();
|
| +typedef F7<T>
|
| + = Function Function(int x0, {int x}) Function();
|
| +typedef F8<T>
|
| + = Function Function([core.List<core.int> x]) Function();
|
| +typedef F9<T>
|
| + = List<Function> Function(int y, [int x]) Function();
|
| +typedef F10<T>
|
| + = List<Function> Function(int x1, [List<Function> x2]) Function();
|
| +typedef F11<T>
|
| + = List<Function> Function(int x0, {List<T> x}) Function();
|
| +typedef F12<T>
|
| + = core.List<core.int> Function(List<Function> x) Function();
|
| +typedef F13<T>
|
| + = core.List<core.int> Function(int y, [List<T> x]) Function();
|
| +typedef F14<T>
|
| + = List<T> Function([Function x1]) Function();
|
| +typedef F15<T>
|
| + = List<T> Function({core.List<core.int> x}) Function();
|
| +typedef F16<T>
|
| + = Function(int y, {int x}) Function();
|
| +typedef F17<T>
|
| + = Function(int x0, [core.List<core.int> x]) Function();
|
| +typedef F18<T>
|
| + = void Function(int x0) Function();
|
| +typedef F19<T>
|
| + = void Function(int x, [List<Function> x2]) Function();
|
| +typedef F20<T>
|
| + = void Function(int y, {List<T> x}) Function();
|
| +typedef F21<T>
|
| + = List<Function> Function<A>(List<A> x) Function();
|
| +typedef F22<T>
|
| + = A Function<A>(int x) Function();
|
| +typedef F23<T>
|
| + = List<Function> Function(B x) Function<B extends core.int>();
|
|
|
| int f0(int x0, [List<Function> x]) => null;
|
| List<Function> f1([Function x]) => null;
|
| @@ -74,7 +99,6 @@ List<Function> Function<A>(List<A> x) f21() => null;
|
| A Function<A>(int x) f22() => null;
|
| List<Function> Function(B x) f23<B extends core.int>() => null;
|
|
|
| -
|
| class U24<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -105,7 +129,6 @@ class U24<T> {
|
| A Function<A>(int x) Function() x22;
|
| List<Function> Function(B x) Function<B extends core.int>() x23;
|
|
|
| -
|
| U24({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -134,7 +157,6 @@ class U24<T> {
|
| A Function<A>(int x) m22() => null;
|
| List<Function> Function(B x) m23<B extends core.int>() => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -184,7 +206,6 @@ class U24<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// List<Function> Function([Function x])
|
| @@ -209,7 +230,6 @@ class U24<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// List<T> Function(int x)
|
| @@ -243,11 +263,19 @@ class U24<T> {
|
| Expect.equals(tIsDynamic, confuse(m2) is F2<bool>);
|
| } else {
|
| if (inCheckedMode) {
|
| - Expect.throws(() { x2 = (f2 as dynamic); });
|
| - Expect.throws(() { x2 = confuse(f2); });
|
| + 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.
|
| @@ -287,11 +315,19 @@ class U24<T> {
|
| Expect.equals(tIsDynamic, confuse(m3) is F3<bool>);
|
| } else {
|
| if (inCheckedMode) {
|
| - Expect.throws(() { x3 = (f3 as dynamic); });
|
| - Expect.throws(() { x3 = confuse(f3); });
|
| + 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.
|
| @@ -331,11 +367,19 @@ class U24<T> {
|
| Expect.equals(tIsDynamic, confuse(m4) is F4<bool>);
|
| } else {
|
| if (inCheckedMode) {
|
| - Expect.throws(() { x4 = (f4 as dynamic); });
|
| - Expect.throws(() { x4 = confuse(f4); });
|
| + Expect.throws(() {
|
| + x4 = (f4 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x4 = confuse(f4);
|
| + });
|
| List<T> Function<A>(int x) l4;
|
| - Expect.throws(() { l4 = (f4 as dynamic); });
|
| - Expect.throws(() { l4 = confuse(f4); });
|
| + Expect.throws(() {
|
| + l4 = (f4 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l4 = confuse(f4);
|
| + });
|
| }
|
| List<T> Function<A>(int x) l4 = m4;
|
| // In checked mode, verifies the type.
|
| @@ -366,7 +410,6 @@ class U24<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function(int x, [core.List<core.int> x2]) Function()
|
| @@ -384,14 +427,14 @@ class U24<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int x, [core.List<core.int> x2]) Function());
|
| + Expect
|
| + .isTrue(m6 is int Function(int x, [core.List<core.int> x2]) 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 x0, {int x}) Function()
|
| @@ -416,7 +459,6 @@ class U24<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function([core.List<core.int> x]) Function()
|
| @@ -441,7 +483,6 @@ class U24<T> {
|
| l8 = m8;
|
| x8 = confuse(m8);
|
| l8 = confuse(m8);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int y, [int x]) Function()
|
| @@ -466,7 +507,6 @@ class U24<T> {
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x1, [List<Function> x2]) Function()
|
| @@ -484,14 +524,14 @@ class U24<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(int x1, [List<Function> x2]) Function());
|
| + Expect.isTrue(
|
| + m10 is List<Function> Function(int x1, [List<Function> x2]) 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(int x0, {List<T> x}) Function()
|
| @@ -509,7 +549,8 @@ class U24<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is List<Function> Function(int x0, {List<T> x}) Function());
|
| + Expect
|
| + .isTrue(m11 is List<Function> Function(int x0, {List<T> x}) Function());
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -525,11 +566,19 @@ class U24<T> {
|
| Expect.equals(tIsDynamic, confuse(m11) is F11<bool>);
|
| } else {
|
| if (inCheckedMode) {
|
| - Expect.throws(() { x11 = (f11 as dynamic); });
|
| - Expect.throws(() { x11 = confuse(f11); });
|
| + Expect.throws(() {
|
| + x11 = (f11 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x11 = confuse(f11);
|
| + });
|
| List<Function> Function(int x0, {List<T> x}) 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 x0, {List<T> x}) Function() l11 = m11;
|
| // In checked mode, verifies the type.
|
| @@ -553,14 +602,14 @@ class U24<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(List<Function> x) Function());
|
| + Expect.isTrue(
|
| + m12 is core.List<core.int> Function(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(int y, [List<T> x]) Function()
|
| @@ -578,7 +627,8 @@ class U24<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(int y, [List<T> x]) Function());
|
| + Expect.isTrue(
|
| + m13 is core.List<core.int> Function(int y, [List<T> x]) Function());
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -594,11 +644,19 @@ class U24<T> {
|
| Expect.equals(tIsDynamic, confuse(m13) is F13<bool>);
|
| } else {
|
| if (inCheckedMode) {
|
| - Expect.throws(() { x13 = (f13 as dynamic); });
|
| - Expect.throws(() { x13 = confuse(f13); });
|
| + Expect.throws(() {
|
| + x13 = (f13 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x13 = confuse(f13);
|
| + });
|
| core.List<core.int> Function(int y, [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(int y, [List<T> x]) Function() l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -638,11 +696,19 @@ class U24<T> {
|
| Expect.equals(tIsDynamic, confuse(m14) is F14<bool>);
|
| } else {
|
| if (inCheckedMode) {
|
| - Expect.throws(() { x14 = (f14 as dynamic); });
|
| - Expect.throws(() { x14 = confuse(f14); });
|
| + Expect.throws(() {
|
| + x14 = (f14 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x14 = confuse(f14);
|
| + });
|
| List<T> Function([Function x1]) 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 x1]) Function() l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -682,11 +748,19 @@ class U24<T> {
|
| Expect.equals(tIsDynamic, confuse(m15) is F15<bool>);
|
| } else {
|
| if (inCheckedMode) {
|
| - Expect.throws(() { x15 = (f15 as dynamic); });
|
| - Expect.throws(() { x15 = confuse(f15); });
|
| + Expect.throws(() {
|
| + x15 = (f15 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x15 = confuse(f15);
|
| + });
|
| List<T> Function({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({core.List<core.int> x}) Function() l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -717,7 +791,6 @@ class U24<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(int x0, [core.List<core.int> x]) Function()
|
| @@ -742,7 +815,6 @@ class U24<T> {
|
| l17 = m17;
|
| x17 = confuse(m17);
|
| l17 = confuse(m17);
|
| -
|
| }
|
|
|
| /// void Function(int x0) Function()
|
| @@ -767,7 +839,6 @@ class U24<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int x, [List<Function> x2]) Function()
|
| @@ -792,7 +863,6 @@ class U24<T> {
|
| l19 = m19;
|
| x19 = confuse(m19);
|
| l19 = confuse(m19);
|
| -
|
| }
|
|
|
| /// void Function(int y, {List<T> x}) Function()
|
| @@ -826,11 +896,19 @@ class U24<T> {
|
| Expect.equals(tIsDynamic, confuse(m20) is F20<bool>);
|
| } else {
|
| if (inCheckedMode) {
|
| - Expect.throws(() { x20 = (f20 as dynamic); });
|
| - Expect.throws(() { x20 = confuse(f20); });
|
| + Expect.throws(() {
|
| + x20 = (f20 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x20 = confuse(f20);
|
| + });
|
| void Function(int y, {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(int y, {List<T> x}) Function() l20 = m20;
|
| // In checked mode, verifies the type.
|
| @@ -861,7 +939,6 @@ class U24<T> {
|
| l21 = m21;
|
| x21 = confuse(m21);
|
| l21 = confuse(m21);
|
| -
|
| }
|
|
|
| /// A Function<A>(int x) Function()
|
| @@ -886,7 +963,6 @@ class U24<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
|
|
| /// List<Function> Function(B x) Function<B extends core.int>()
|
| @@ -904,17 +980,15 @@ class U24<T> {
|
| }
|
|
|
| Expect.isTrue(m23 is F23);
|
| - Expect.isTrue(m23 is List<Function> Function(B x) Function<B extends core.int>());
|
| + Expect.isTrue(
|
| + m23 is List<Function> Function(B x) Function<B extends core.int>());
|
| Expect.isTrue(confuse(m23) is F23);
|
| // In checked mode, verifies the type.
|
| x23 = m23;
|
| l23 = m23;
|
| x23 = confuse(m23);
|
| l23 = confuse(m23);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -922,4 +996,3 @@ void main() {
|
| new U24<int>(tIsInt: true).runTests();
|
| new U24<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|