| Index: tests/language/function_type/function_type25_test.dart
|
| diff --git a/tests/language/function_type/function_type25_test.dart b/tests/language/function_type/function_type25_test.dart
|
| index e17b1fc0df3cf1d38ebd8dd0359911c036637b7c..6ee5d165e1f00c8c706cd0fa0d7b1d3718a3e13e 100644
|
| --- a/tests/language/function_type/function_type25_test.dart
|
| +++ b/tests/language/function_type/function_type25_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 y, [List<Function> x]);
|
| -typedef F1<T> = List<Function> Function(int x0, [Function x]);
|
| -typedef F2<T> = List<T> Function([int x]);
|
| -typedef F3<T> = Function([List<T> x]);
|
| -typedef F4<T> = List<T> Function<A>(Function x);
|
| -typedef F5<T> = int Function(Function x1) Function(int x);
|
| -typedef F6<T> = int Function(int x, [core.List<core.int> x1]) Function(int x);
|
| -typedef F7<T> = Function Function(int x1, {int x}) Function(int x);
|
| -typedef F8<T> = Function Function([core.List<core.int> x]) Function(int x);
|
| -typedef F9<T> = List<Function> Function(int y, [int x]) Function(int x);
|
| -typedef F10<T> = List<Function> Function(int x2, [List<Function> x3]) Function(int x);
|
| -typedef F11<T> = List<Function> Function(int x1, {List<T> x}) Function(int x);
|
| -typedef F12<T> = core.List<core.int> Function(List<Function> x) Function(int x);
|
| -typedef F13<T> = core.List<core.int> Function(int y, [List<T> x]) Function(int x);
|
| -typedef F14<T> = List<T> Function([Function x1]) Function(int x);
|
| -typedef F15<T> = List<T> Function({core.List<core.int> x}) Function(int x);
|
| -typedef F16<T> = Function(int y, {int x}) Function(int x);
|
| -typedef F17<T> = Function(int x1, [core.List<core.int> x]) Function(int x);
|
| -typedef F18<T> = void Function(int x1) Function(int x);
|
| -typedef F19<T> = void Function(int x, [List<Function> x1]) Function(int x);
|
| -typedef F20<T> = void Function(int y, {List<T> x}) Function(int x);
|
| -typedef F21<T> = List<Function> Function<A>(List<A> x) Function(int x);
|
| -typedef F22<T> = A Function<A>(int x) Function(int x);
|
| -typedef F23<T> = List<Function> Function(B x) Function<B extends core.int>(int x);
|
| -
|
| +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]);
|
| +typedef F3<T>
|
| + = Function([List<T> x]);
|
| +typedef F4<T>
|
| + = List<T> Function<A>(Function x);
|
| +typedef F5<T>
|
| + = int Function(Function x1) Function(int x);
|
| +typedef F6<T>
|
| + = int Function(int x, [core.List<core.int> x1]) Function(int x);
|
| +typedef F7<T>
|
| + = Function Function(int x1, {int x}) Function(int x);
|
| +typedef F8<T>
|
| + = Function Function([core.List<core.int> x]) Function(int x);
|
| +typedef F9<T>
|
| + = List<Function> Function(int y, [int x]) Function(int x);
|
| +typedef F10<T>
|
| + = List<Function> Function(int x2, [List<Function> x3]) Function(int x);
|
| +typedef F11<T>
|
| + = List<Function> Function(int x1, {List<T> x}) Function(int x);
|
| +typedef F12<T>
|
| + = core.List<core.int> Function(List<Function> x) Function(int x);
|
| +typedef F13<T>
|
| + = core.List<core.int> Function(int y, [List<T> x]) Function(int x);
|
| +typedef F14<T>
|
| + = List<T> Function([Function x1]) Function(int x);
|
| +typedef F15<T>
|
| + = List<T> Function({core.List<core.int> x}) Function(int x);
|
| +typedef F16<T>
|
| + = Function(int y, {int x}) Function(int x);
|
| +typedef F17<T>
|
| + = Function(int x1, [core.List<core.int> x]) Function(int x);
|
| +typedef F18<T>
|
| + = void Function(int x1) Function(int x);
|
| +typedef F19<T>
|
| + = void Function(int x, [List<Function> x1]) Function(int x);
|
| +typedef F20<T>
|
| + = void Function(int y, {List<T> x}) Function(int x);
|
| +typedef F21<T>
|
| + = List<Function> Function<A>(List<A> x) Function(int x);
|
| +typedef F22<T>
|
| + = A Function<A>(int x) Function(int x);
|
| +typedef F23<T>
|
| + = List<Function> Function(B x) Function<B extends core.int>(int x);
|
|
|
| int f0(int y, [List<Function> x]) => null;
|
| List<Function> f1(int x0, [Function x]) => null;
|
| @@ -74,7 +99,6 @@ List<Function> Function<A>(List<A> x) f21(int x) => null;
|
| A Function<A>(int x) f22(int x) => null;
|
| List<Function> Function(B x) f23<B extends core.int>(int x) => null;
|
|
|
| -
|
| class U25<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -105,7 +129,6 @@ class U25<T> {
|
| A Function<A>(int x) Function(int x) x22;
|
| List<Function> Function(B x) Function<B extends core.int>(int x) x23;
|
|
|
| -
|
| U25({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -134,7 +157,6 @@ class U25<T> {
|
| A Function<A>(int x) m22(int x) => null;
|
| List<Function> Function(B x) m23<B extends core.int>(int x) => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -184,7 +206,6 @@ class U25<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x0, [Function x])
|
| @@ -209,7 +230,6 @@ class U25<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// List<T> Function([int x])
|
| @@ -243,11 +263,19 @@ class U25<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 U25<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 U25<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>(Function 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>(Function x) l4 = m4;
|
| // In checked mode, verifies the type.
|
| @@ -366,7 +410,6 @@ class U25<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function(int x, [core.List<core.int> x1]) Function(int x)
|
| @@ -384,14 +427,14 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int x, [core.List<core.int> x1]) Function(int x));
|
| + Expect.isTrue(
|
| + m6 is int Function(int x, [core.List<core.int> x1]) Function(int x));
|
| 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, {int x}) Function(int x)
|
| @@ -416,7 +459,6 @@ class U25<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function([core.List<core.int> x]) Function(int x)
|
| @@ -434,14 +476,14 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function([core.List<core.int> x]) Function(int x));
|
| + Expect.isTrue(
|
| + m8 is Function Function([core.List<core.int> x]) 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 y, [int x]) Function(int x)
|
| @@ -459,14 +501,14 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(int y, [int x]) Function(int x));
|
| + Expect
|
| + .isTrue(m9 is List<Function> Function(int y, [int x]) Function(int x));
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x2, [List<Function> x3]) Function(int x)
|
| @@ -484,14 +526,14 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(int x2, [List<Function> x3]) Function(int x));
|
| + Expect.isTrue(m10 is List<Function> Function(int x2,
|
| + [List<Function> x3]) 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);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x1, {List<T> x}) Function(int x)
|
| @@ -509,7 +551,8 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is List<Function> Function(int x1, {List<T> x}) Function(int x));
|
| + Expect.isTrue(
|
| + m11 is List<Function> Function(int x1, {List<T> x}) Function(int x));
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -525,11 +568,19 @@ class U25<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 x1, {List<T> x}) Function(int x) 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 x1, {List<T> x}) Function(int x) l11 = m11;
|
| // In checked mode, verifies the type.
|
| @@ -553,14 +604,14 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(List<Function> x) Function(int x));
|
| + Expect.isTrue(
|
| + m12 is core.List<core.int> Function(List<Function> 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);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int y, [List<T> x]) Function(int x)
|
| @@ -578,7 +629,8 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(int y, [List<T> x]) Function(int x));
|
| + Expect.isTrue(m13 is core.List<core.int> Function(int y,
|
| + [List<T> x]) Function(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -594,13 +646,22 @@ class U25<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(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(int y, [List<T> x]) Function(int x) l13 = m13;
|
| + core.List<core.int> Function(int y, [List<T> x]) Function(int x) l13 =
|
| + m13;
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| x13 = confuse(m13);
|
| @@ -638,11 +699,19 @@ class U25<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(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([Function x1]) Function(int x) l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -666,7 +735,8 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function({core.List<core.int> x}) Function(int x));
|
| + Expect.isTrue(
|
| + m15 is List<T> Function({core.List<core.int> x}) Function(int x));
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -682,11 +752,19 @@ class U25<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(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({core.List<core.int> x}) Function(int x) l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -717,7 +795,6 @@ class U25<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(int x1, [core.List<core.int> x]) Function(int x)
|
| @@ -735,14 +812,14 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m17 is F17);
|
| - Expect.isTrue(m17 is Function(int x1, [core.List<core.int> x]) Function(int x));
|
| + Expect.isTrue(
|
| + m17 is Function(int x1, [core.List<core.int> x]) 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) Function(int x)
|
| @@ -767,7 +844,6 @@ class U25<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int x, [List<Function> x1]) Function(int x)
|
| @@ -785,14 +861,14 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int x, [List<Function> x1]) Function(int x));
|
| + Expect.isTrue(
|
| + m19 is void Function(int x, [List<Function> x1]) 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);
|
| -
|
| }
|
|
|
| /// void Function(int y, {List<T> x}) Function(int x)
|
| @@ -826,11 +902,19 @@ class U25<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(int x) 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(int x) l20 = m20;
|
| // In checked mode, verifies the type.
|
| @@ -861,7 +945,6 @@ class U25<T> {
|
| l21 = m21;
|
| x21 = confuse(m21);
|
| l21 = confuse(m21);
|
| -
|
| }
|
|
|
| /// A Function<A>(int x) Function(int x)
|
| @@ -886,7 +969,6 @@ class U25<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
|
|
| /// List<Function> Function(B x) Function<B extends core.int>(int x)
|
| @@ -904,17 +986,15 @@ class U25<T> {
|
| }
|
|
|
| Expect.isTrue(m23 is F23);
|
| - Expect.isTrue(m23 is List<Function> Function(B x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m23 is List<Function> Function(
|
| + B 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() {
|
| @@ -922,4 +1002,3 @@ void main() {
|
| new U25<int>(tIsInt: true).runTests();
|
| new U25<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|