| Index: tests/language/function_type/function_type33_test.dart
|
| diff --git a/tests/language/function_type/function_type33_test.dart b/tests/language/function_type/function_type33_test.dart
|
| index 68f0d3ef2da2ab4bcace609fc33f98d2d771b836..729e0b561cf1c456f2c32f2c4972345ceb3278bc 100644
|
| --- a/tests/language/function_type/function_type33_test.dart
|
| +++ b/tests/language/function_type/function_type33_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(core.List<core.int> x);
|
| -typedef F1<T> = List<Function> Function(int y, {Function x});
|
| -typedef F2<T> = List<T> Function(int x0, {int x});
|
| -typedef F3<T> = Function(int x0, {List<T> x});
|
| -typedef F4<T> = Function<A>(Function x);
|
| -typedef F5<T> = int Function(int x2, [Function x3]) Function(int x);
|
| -typedef F6<T> = int Function(int x1, {core.List<core.int> x}) Function(int x);
|
| -typedef F7<T> = Function Function(Function x) Function(int x);
|
| -typedef F8<T> = Function Function(int y, [core.List<core.int> x]) Function(int x);
|
| -typedef F9<T> = List<Function> Function([int x1]) Function(int x);
|
| -typedef F10<T> = List<Function> Function({List<Function> x}) Function(int x);
|
| -typedef F11<T> = List<Function> Function() Function(int x);
|
| -typedef F12<T> = core.List<core.int> Function(int x1, [List<Function> x]) Function(int x);
|
| -typedef F13<T> = core.List<core.int> Function([List<T> x1]) Function(int x);
|
| -typedef F14<T> = List<T> Function(int x, [Function x1]) Function(int x);
|
| -typedef F15<T> = List<T> Function(int y, {core.List<core.int> x}) Function(int x);
|
| -typedef F16<T> = Function([Function x]) Function(int x);
|
| -typedef F17<T> = Function(core.List<core.int> x1) Function(int x);
|
| -typedef F18<T> = void Function(int x2, [int x3]) Function(int x);
|
| -typedef F19<T> = void Function(int x1, {List<Function> x}) Function(int x);
|
| -typedef F20<T> = int Function<A>(int x) Function(int x);
|
| -typedef F21<T> = core.List<core.int> Function<A>(Function x) Function(int x);
|
| -typedef F22<T> = A Function<A>(List<Function> x) Function(int x);
|
| -typedef F23<T> = B 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(core.List<core.int> x);
|
| +typedef F1<T>
|
| + = List<Function> Function(int y, {Function x});
|
| +typedef F2<T>
|
| + = List<T> Function(int x0, {int x});
|
| +typedef F3<T>
|
| + = Function(int x0, {List<T> x});
|
| +typedef F4<T>
|
| + = Function<A>(Function x);
|
| +typedef F5<T>
|
| + = int Function(int x2, [Function x3]) Function(int x);
|
| +typedef F6<T>
|
| + = int Function(int x1, {core.List<core.int> x}) Function(int x);
|
| +typedef F7<T>
|
| + = Function Function(Function x) Function(int x);
|
| +typedef F8<T>
|
| + = Function Function(int y, [core.List<core.int> x]) Function(int x);
|
| +typedef F9<T>
|
| + = List<Function> Function([int x1]) Function(int x);
|
| +typedef F10<T>
|
| + = List<Function> Function({List<Function> x}) Function(int x);
|
| +typedef F11<T>
|
| + = List<Function> Function() Function(int x);
|
| +typedef F12<T>
|
| + = core.List<core.int> Function(int x1, [List<Function> x]) Function(int x);
|
| +typedef F13<T>
|
| + = core.List<core.int> Function([List<T> x1]) Function(int x);
|
| +typedef F14<T>
|
| + = List<T> Function(int x, [Function x1]) Function(int x);
|
| +typedef F15<T>
|
| + = List<T> Function(int y, {core.List<core.int> x}) Function(int x);
|
| +typedef F16<T>
|
| + = Function([Function x]) Function(int x);
|
| +typedef F17<T>
|
| + = Function(core.List<core.int> x1) Function(int x);
|
| +typedef F18<T>
|
| + = void Function(int x2, [int x3]) Function(int x);
|
| +typedef F19<T>
|
| + = void Function(int x1, {List<Function> x}) Function(int x);
|
| +typedef F20<T>
|
| + = int Function<A>(int x) Function(int x);
|
| +typedef F21<T>
|
| + = core.List<core.int> Function<A>(Function x) Function(int x);
|
| +typedef F22<T>
|
| + = A Function<A>(List<Function> x) Function(int x);
|
| +typedef F23<T>
|
| + = B Function(B x) Function<B extends core.int>(int x);
|
|
|
| int f0(core.List<core.int> x) => null;
|
| List<Function> f1(int y, {Function x}) => null;
|
| @@ -74,7 +99,6 @@ core.List<core.int> Function<A>(Function x) f21(int x) => null;
|
| A Function<A>(List<Function> x) f22(int x) => null;
|
| B Function(B x) f23<B extends core.int>(int x) => null;
|
|
|
| -
|
| class U33<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -105,7 +129,6 @@ class U33<T> {
|
| A Function<A>(List<Function> x) Function(int x) x22;
|
| B Function(B x) Function<B extends core.int>(int x) x23;
|
|
|
| -
|
| U33({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -134,7 +157,6 @@ class U33<T> {
|
| A Function<A>(List<Function> x) m22(int x) => null;
|
| B Function(B x) m23<B extends core.int>(int x) => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -184,7 +206,6 @@ class U33<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int y, {Function x})
|
| @@ -209,7 +230,6 @@ class U33<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// List<T> Function(int x0, {int x})
|
| @@ -243,11 +263,19 @@ class U33<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 x0, {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 x0, {int x}) l2 = m2;
|
| // In checked mode, verifies the type.
|
| @@ -287,11 +315,19 @@ class U33<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(int x0, {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(int x0, {List<T> x}) l3 = m3;
|
| // In checked mode, verifies the type.
|
| @@ -322,7 +358,6 @@ class U33<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int x2, [Function x3]) Function(int x)
|
| @@ -347,7 +382,6 @@ class U33<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function(int x1, {core.List<core.int> x}) Function(int x)
|
| @@ -365,14 +399,14 @@ class U33<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int x1, {core.List<core.int> x}) Function(int x));
|
| + Expect.isTrue(
|
| + m6 is int Function(int x1, {core.List<core.int> x}) 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(Function x) Function(int x)
|
| @@ -397,7 +431,6 @@ class U33<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int y, [core.List<core.int> x]) Function(int x)
|
| @@ -415,14 +448,14 @@ class U33<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int y, [core.List<core.int> x]) Function(int x));
|
| + Expect.isTrue(m8 is Function Function(int y,
|
| + [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 x1]) Function(int x)
|
| @@ -447,7 +480,6 @@ class U33<T> {
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function({List<Function> x}) Function(int x)
|
| @@ -465,14 +497,14 @@ class U33<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function({List<Function> x}) Function(int x));
|
| + Expect.isTrue(
|
| + m10 is List<Function> Function({List<Function> 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);
|
| -
|
| }
|
|
|
| /// List<Function> Function() Function(int x)
|
| @@ -497,7 +529,6 @@ class U33<T> {
|
| l11 = m11;
|
| x11 = confuse(m11);
|
| l11 = confuse(m11);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x1, [List<Function> x]) Function(int x)
|
| @@ -505,7 +536,8 @@ class U33<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, [List<Function> x]) Function(int x) l12;
|
| + core.List<core.int> Function(int x1, [List<Function> x]) Function(int x)
|
| + l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -515,14 +547,14 @@ class U33<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x1, [List<Function> x]) Function(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int x1,
|
| + [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([List<T> x1]) Function(int x)
|
| @@ -540,7 +572,8 @@ class U33<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function([List<T> x1]) Function(int x));
|
| + Expect.isTrue(
|
| + m13 is core.List<core.int> Function([List<T> x1]) Function(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -556,11 +589,19 @@ class U33<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([List<T> 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);
|
| + });
|
| }
|
| core.List<core.int> Function([List<T> x1]) Function(int x) l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -584,7 +625,8 @@ class U33<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(int x, [Function x1]) Function(int x));
|
| + Expect
|
| + .isTrue(m14 is List<T> Function(int x, [Function x1]) Function(int x));
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -600,11 +642,19 @@ class U33<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(int x, [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, [Function x1]) Function(int x) l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -628,7 +678,8 @@ class U33<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int y, {core.List<core.int> x}) Function(int x));
|
| + Expect.isTrue(m15 is List<T> Function(int y,
|
| + {core.List<core.int> x}) Function(int x));
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -644,13 +695,22 @@ class U33<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(int y, {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(int y, {core.List<core.int> x}) Function(int x) l15 = m15;
|
| + List<T> Function(int y, {core.List<core.int> x}) Function(int x) l15 =
|
| + m15;
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| x15 = confuse(m15);
|
| @@ -679,7 +739,6 @@ class U33<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(core.List<core.int> x1) Function(int x)
|
| @@ -704,7 +763,6 @@ class U33<T> {
|
| l17 = m17;
|
| x17 = confuse(m17);
|
| l17 = confuse(m17);
|
| -
|
| }
|
|
|
| /// void Function(int x2, [int x3]) Function(int x)
|
| @@ -729,7 +787,6 @@ class U33<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int x1, {List<Function> x}) Function(int x)
|
| @@ -747,14 +804,14 @@ class U33<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int x1, {List<Function> x}) Function(int x));
|
| + Expect.isTrue(
|
| + m19 is void Function(int x1, {List<Function> 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>(int x) Function(int x)
|
| @@ -779,7 +836,6 @@ class U33<T> {
|
| l20 = m20;
|
| x20 = confuse(m20);
|
| l20 = confuse(m20);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function<A>(Function x) Function(int x)
|
| @@ -797,14 +853,14 @@ class U33<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is core.List<core.int> Function<A>(Function x) Function(int x));
|
| + Expect.isTrue(
|
| + m21 is core.List<core.int> Function<A>(Function x) Function(int x));
|
| 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(int x)
|
| @@ -829,7 +885,6 @@ class U33<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
|
|
| /// B Function(B x) Function<B extends core.int>(int x)
|
| @@ -854,10 +909,7 @@ class U33<T> {
|
| l23 = m23;
|
| x23 = confuse(m23);
|
| l23 = confuse(m23);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -865,4 +917,3 @@ void main() {
|
| new U33<int>(tIsInt: true).runTests();
|
| new U33<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|