| Index: tests/language/function_type/function_type50_test.dart
|
| diff --git a/tests/language/function_type/function_type50_test.dart b/tests/language/function_type/function_type50_test.dart
|
| index 8bf8463c1e4de498b9800dce311209353109f0a8..f69caa7cb4e9dd0c35423880e861ad435924936c 100644
|
| --- a/tests/language/function_type/function_type50_test.dart
|
| +++ b/tests/language/function_type/function_type50_test.dart
|
| @@ -19,64 +19,42 @@ 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 x1, [List<T> x2]);
|
| -typedef F1<T>
|
| - = List<Function> Function([core.List<core.int> x1]);
|
| -typedef F2<T>
|
| - = List<T> Function(List<Function> x0);
|
| -typedef F3<T>
|
| - = void Function(int y, [Function x]);
|
| -typedef F4<T>
|
| - = List<A> Function<A>(List<Function> x);
|
| -typedef F5<T>
|
| - = int Function(int y, {Function x}) Function<B extends core.int>();
|
| -typedef F6<T>
|
| - = int Function(int x1, [List<T> x]) Function<B extends core.int>();
|
| -typedef F7<T>
|
| - = Function Function(Function x1) Function<B extends core.int>();
|
| -typedef F8<T>
|
| - = Function Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>();
|
| -typedef F9<T>
|
| - = List<Function> Function(int x1, {int x}) Function<B extends core.int>();
|
| -typedef F10<T>
|
| - = List<Function> Function(
|
| - [core.List<core.int> x]) Function<B extends core.int>();
|
| -typedef F11<T>
|
| - = core.List<core.int> Function(int y,
|
| - [int x]) Function<B extends core.int>();
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(int x2,
|
| - [List<Function> x3]) Function<B extends core.int>();
|
| -typedef F13<T>
|
| - = core.List<core.int> Function(int x1,
|
| - {List<T> x}) Function<B extends core.int>();
|
| -typedef F14<T>
|
| - = List<T> Function(List<Function> x) Function<B extends core.int>();
|
| -typedef F15<T>
|
| - = List<T> Function(int y, [List<T> x]) Function<B extends core.int>();
|
| -typedef F16<T>
|
| - = Function([Function x1]) Function<B extends core.int>();
|
| -typedef F17<T>
|
| - = Function({core.List<core.int> x}) Function<B extends core.int>();
|
| -typedef F18<T>
|
| - = void Function(int y, {int x}) Function<B extends core.int>();
|
| -typedef F19<T>
|
| - = void Function(int x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>();
|
| -typedef F20<T>
|
| - = int Function<A>(List<T> x) Function<B extends core.int>();
|
| -typedef F21<T>
|
| - = core.List<core.int> Function<A>() Function<B extends core.int>();
|
| -typedef F22<T>
|
| - = A Function<A>(A x) Function<B extends core.int>();
|
| +typedef F0<T> = int Function(int x1, [List<T> x2]);
|
| +typedef F1<T> = List<Function> Function([core.List<core.int> x1]);
|
| +typedef F2<T> = List<T> Function(List<Function> x0);
|
| +typedef F3<T> = void Function(int y, [Function x]);
|
| +typedef F4<T> = List<A> Function<A>(List<Function> x);
|
| +typedef F5<T> = int Function(int y, {Function x})
|
| + Function<B extends core.int>();
|
| +typedef F6<T> = int Function(int x1, [List<T> x])
|
| + Function<B extends core.int>();
|
| +typedef F7<T> = Function Function(Function x1) Function<B extends core.int>();
|
| +typedef F8<T> = Function Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>();
|
| +typedef F9<T> = List<Function> Function(int x1, {int x})
|
| + Function<B extends core.int>();
|
| +typedef F10<T> = List<Function> Function([core.List<core.int> x])
|
| + Function<B extends core.int>();
|
| +typedef F11<T> = core.List<core.int> Function(int y, [int x])
|
| + Function<B extends core.int>();
|
| +typedef F12<T> = core.List<core.int> Function(int x2, [List<Function> x3])
|
| + Function<B extends core.int>();
|
| +typedef F13<T> = core.List<core.int> Function(int x1, {List<T> x})
|
| + Function<B extends core.int>();
|
| +typedef F14<T> = List<T> Function(List<Function> x)
|
| + Function<B extends core.int>();
|
| +typedef F15<T> = List<T> Function(int y, [List<T> x])
|
| + Function<B extends core.int>();
|
| +typedef F16<T> = Function([Function x1]) Function<B extends core.int>();
|
| +typedef F17<T> = Function({core.List<core.int> x})
|
| + Function<B extends core.int>();
|
| +typedef F18<T> = void Function(int y, {int x}) Function<B extends core.int>();
|
| +typedef F19<T> = void Function(int x1, [core.List<core.int> x])
|
| + Function<B extends core.int>();
|
| +typedef F20<T> = int Function<A>(List<T> x) Function<B extends core.int>();
|
| +typedef F21<T> = core.List<core.int> Function<A>()
|
| + Function<B extends core.int>();
|
| +typedef F22<T> = A Function<A>(A x) Function<B extends core.int>();
|
|
|
| int f0(int x0, [List<int> x1]) => null;
|
| List<Function> f1([core.List<core.int> x0]) => null;
|
| @@ -120,17 +98,17 @@ class U50<T> {
|
| int Function(int y, {Function x}) Function<B extends core.int>() x5;
|
| int Function(int x1, [List<T> x]) Function<B extends core.int>() x6;
|
| Function Function(Function x1) Function<B extends core.int>() x7;
|
| - Function Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>() x8;
|
| + Function Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>() x8;
|
| List<Function> Function(int x1, {int x}) Function<B extends core.int>() x9;
|
| - List<Function> Function(
|
| - [core.List<core.int> x]) Function<B extends core.int>() x10;
|
| + List<Function> Function([core.List<core.int> x])
|
| + Function<B extends core.int>() x10;
|
| core.List<core.int> Function(int y, [int x]) Function<B extends core.int>()
|
| x11;
|
| - core.List<core.int> Function(int x2,
|
| - [List<Function> x3]) Function<B extends core.int>() x12;
|
| - core.List<core.int> Function(int x1,
|
| - {List<T> x}) Function<B extends core.int>() x13;
|
| + core.List<core.int> Function(int x2, [List<Function> x3])
|
| + Function<B extends core.int>() x12;
|
| + core.List<core.int> Function(int x1, {List<T> x})
|
| + Function<B extends core.int>() x13;
|
| List<T> Function(List<Function> x) Function<B extends core.int>() x14;
|
| List<T> Function(int y, [List<T> x]) Function<B extends core.int>() x15;
|
| Function([Function x1]) Function<B extends core.int>() x16;
|
| @@ -231,7 +209,7 @@ class U50<T> {
|
| Expect.equals(tIsDynamic, m0 is F0<bool>);
|
| Expect.equals(tIsDynamic, confuse(m0) is F0<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x0 = (f0 as dynamic);
|
| });
|
| @@ -307,7 +285,7 @@ class U50<T> {
|
| Expect.equals(tIsDynamic, m2 is F2<bool>);
|
| Expect.equals(tIsDynamic, confuse(m2) is F2<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x2 = (f2 as dynamic);
|
| });
|
| @@ -433,7 +411,7 @@ class U50<T> {
|
| Expect.equals(tIsDynamic, m6 is F6<bool>);
|
| Expect.equals(tIsDynamic, confuse(m6) is F6<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x6 = (f6 as dynamic);
|
| });
|
| @@ -485,8 +463,8 @@ class U50<T> {
|
| Expect.isTrue(f8 is F8);
|
| Expect.isTrue(confuse(f8) is F8);
|
| // In checked mode, verifies the type.
|
| - Function Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>() l8;
|
| + Function Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>() l8;
|
| // The static function f8 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x8 = f8 as dynamic;
|
| @@ -496,8 +474,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m8 is Function Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -521,8 +499,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(int x1,
|
| - {int x}) Function<B extends core.int>());
|
| + Expect.isTrue(m9 is List<Function> Function(int x1, {int x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| @@ -536,8 +514,8 @@ class U50<T> {
|
| Expect.isTrue(f10 is F10);
|
| Expect.isTrue(confuse(f10) is F10);
|
| // In checked mode, verifies the type.
|
| - List<Function> Function(
|
| - [core.List<core.int> x]) Function<B extends core.int>() l10;
|
| + List<Function> Function([core.List<core.int> x])
|
| + Function<B extends core.int>() l10;
|
| // The static function f10 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x10 = f10 as dynamic;
|
| @@ -547,8 +525,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(
|
| - [core.List<core.int> x]) Function<B extends core.int>());
|
| + Expect.isTrue(m10 is List<Function> Function([core.List<core.int> x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| @@ -573,8 +551,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(int y,
|
| - [int x]) Function<B extends core.int>());
|
| + Expect.isTrue(m11 is core.List<core.int> Function(int y, [int x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -588,8 +566,8 @@ class U50<T> {
|
| Expect.isTrue(f12 is F12);
|
| Expect.isTrue(confuse(f12) is F12);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int x2,
|
| - [List<Function> x3]) Function<B extends core.int>() l12;
|
| + core.List<core.int> Function(int x2, [List<Function> x3])
|
| + Function<B extends core.int>() l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -600,7 +578,8 @@ class U50<T> {
|
|
|
| Expect.isTrue(m12 is F12);
|
| Expect.isTrue(m12 is core.List<core.int> Function(int x2,
|
| - [List<Function> x3]) Function<B extends core.int>());
|
| + [List<Function> x3])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -614,8 +593,8 @@ class U50<T> {
|
| Expect.isTrue(f13 is F13);
|
| Expect.isTrue(confuse(f13) is F13);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int x1,
|
| - {List<T> x}) Function<B extends core.int>() l13;
|
| + core.List<core.int> Function(int x1, {List<T> x})
|
| + Function<B extends core.int>() l13;
|
| // The static function f13 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x13 = f13 as dynamic;
|
| @@ -625,8 +604,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(int x1,
|
| - {List<T> x}) Function<B extends core.int>());
|
| + Expect.isTrue(m13 is core.List<core.int> Function(int x1, {List<T> x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -641,15 +620,15 @@ class U50<T> {
|
| Expect.equals(tIsDynamic, m13 is F13<bool>);
|
| Expect.equals(tIsDynamic, confuse(m13) is F13<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x13 = (f13 as dynamic);
|
| });
|
| Expect.throws(() {
|
| x13 = confuse(f13);
|
| });
|
| - core.List<core.int> Function(int x1,
|
| - {List<T> x}) Function<B extends core.int>() l13;
|
| + core.List<core.int> Function(int x1, {List<T> x})
|
| + Function<B extends core.int>() l13;
|
| Expect.throws(() {
|
| l13 = (f13 as dynamic);
|
| });
|
| @@ -657,8 +636,8 @@ class U50<T> {
|
| l13 = confuse(f13);
|
| });
|
| }
|
| - core.List<core.int> Function(int x1,
|
| - {List<T> x}) Function<B extends core.int>() l13 = m13;
|
| + core.List<core.int> Function(int x1, {List<T> x})
|
| + Function<B extends core.int>() l13 = m13;
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| x13 = confuse(m13);
|
| @@ -680,8 +659,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(
|
| - List<Function> x) Function<B extends core.int>());
|
| + Expect.isTrue(m14 is List<T> Function(List<Function> x)
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -696,7 +675,7 @@ class U50<T> {
|
| Expect.equals(tIsDynamic, m14 is F14<bool>);
|
| Expect.equals(tIsDynamic, confuse(m14) is F14<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x14 = (f14 as dynamic);
|
| });
|
| @@ -734,8 +713,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int y,
|
| - [List<T> x]) Function<B extends core.int>());
|
| + Expect.isTrue(m15 is List<T> Function(int y, [List<T> x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -750,7 +729,7 @@ class U50<T> {
|
| Expect.equals(tIsDynamic, m15 is F15<bool>);
|
| Expect.equals(tIsDynamic, confuse(m15) is F15<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x15 = (f15 as dynamic);
|
| });
|
| @@ -813,8 +792,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m17 is F17);
|
| - Expect.isTrue(m17 is Function(
|
| - {core.List<core.int> x}) Function<B extends core.int>());
|
| + Expect.isTrue(m17 is Function({core.List<core.int> x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m17) is F17);
|
| // In checked mode, verifies the type.
|
| x17 = m17;
|
| @@ -853,8 +832,8 @@ class U50<T> {
|
| Expect.isTrue(f19 is F19);
|
| Expect.isTrue(confuse(f19) is F19);
|
| // In checked mode, verifies the type.
|
| - void Function(int x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>() l19;
|
| + void Function(int x1, [core.List<core.int> x])
|
| + Function<B extends core.int>() l19;
|
| // The static function f19 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x19 = f19 as dynamic;
|
| @@ -864,8 +843,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>());
|
| + Expect.isTrue(m19 is void Function(int x1, [core.List<core.int> x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| @@ -905,7 +884,7 @@ class U50<T> {
|
| Expect.equals(tIsDynamic, m20 is F20<bool>);
|
| Expect.equals(tIsDynamic, confuse(m20) is F20<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x20 = (f20 as dynamic);
|
| });
|
| @@ -942,8 +921,8 @@ class U50<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21
|
| - is core.List<core.int> Function<A>() Function<B extends core.int>());
|
| + Expect.isTrue(m21 is core.List<core.int> Function<A>()
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
|
|