| Index: tests/language/function_type/function_type22_test.dart
|
| diff --git a/tests/language/function_type/function_type22_test.dart b/tests/language/function_type/function_type22_test.dart
|
| index 5627e8392192fa8c17d5249bae92094b8eb0bc88..718c00e407e81efd6bc52f71ca9ed948dfcbfc9f 100644
|
| --- a/tests/language/function_type/function_type22_test.dart
|
| +++ b/tests/language/function_type/function_type22_test.dart
|
| @@ -19,65 +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(List<Function> x);
|
| -typedef F1<T>
|
| - = List<Function> Function(int y, {int x});
|
| -typedef F2<T>
|
| - = core.List<core.int> Function(int y, {List<T> x});
|
| -typedef F3<T>
|
| - = Function(int x0, {core.List<core.int> x});
|
| -typedef F4<T>
|
| - = core.List<core.int> Function<A>(A x);
|
| -typedef F5<T>
|
| - = int Function(int y, [Function x]) Function<B extends core.int>();
|
| -typedef F6<T>
|
| - = int Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>();
|
| -typedef F7<T>
|
| - = Function Function({int x}) Function<B extends core.int>();
|
| -typedef F8<T>
|
| - = Function Function(core.List<core.int> x) 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(
|
| - [List<Function> x1]) Function<B extends core.int>();
|
| -typedef F11<T>
|
| - = List<Function> Function({List<T> x}) Function<B extends core.int>();
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(int y,
|
| - {Function x}) 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(Function x1) Function<B extends core.int>();
|
| -typedef F15<T>
|
| - = List<T> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>();
|
| -typedef F16<T>
|
| - = Function(int x1, {int x}) 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 x2, [List<Function> x3]) Function<B extends core.int>();
|
| -typedef F20<T>
|
| - = void Function(int x1, {List<T> x}) Function<B extends core.int>();
|
| -typedef F21<T>
|
| - = List<Function> Function<A>(A x) Function<B extends core.int>();
|
| -typedef F22<T>
|
| - = Function<A>(List<A> x) Function<B extends core.int>();
|
| -typedef F23<T>
|
| - = Function Function(B x) Function<B extends core.int>();
|
| +typedef F0<T> = int Function(List<Function> x);
|
| +typedef F1<T> = List<Function> Function(int y, {int x});
|
| +typedef F2<T> = core.List<core.int> Function(int y, {List<T> x});
|
| +typedef F3<T> = Function(int x0, {core.List<core.int> x});
|
| +typedef F4<T> = core.List<core.int> Function<A>(A x);
|
| +typedef F5<T> = int Function(int y, [Function x])
|
| + Function<B extends core.int>();
|
| +typedef F6<T> = int Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>();
|
| +typedef F7<T> = Function Function({int x}) Function<B extends core.int>();
|
| +typedef F8<T> = Function Function(core.List<core.int> x)
|
| + 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([List<Function> x1])
|
| + Function<B extends core.int>();
|
| +typedef F11<T> = List<Function> Function({List<T> x})
|
| + Function<B extends core.int>();
|
| +typedef F12<T> = core.List<core.int> Function(int y, {Function x})
|
| + 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(Function x1) Function<B extends core.int>();
|
| +typedef F15<T> = List<T> Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>();
|
| +typedef F16<T> = Function(int x1, {int x}) 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 x2, [List<Function> x3])
|
| + Function<B extends core.int>();
|
| +typedef F20<T> = void Function(int x1, {List<T> x})
|
| + Function<B extends core.int>();
|
| +typedef F21<T> = List<Function> Function<A>(A x) Function<B extends core.int>();
|
| +typedef F22<T> = Function<A>(List<A> x) Function<B extends core.int>();
|
| +typedef F23<T> = Function Function(B x) Function<B extends core.int>();
|
|
|
| int f0(List<Function> x) => null;
|
| List<Function> f1(int y, {int x}) => null;
|
| @@ -126,13 +103,13 @@ class U22<T> {
|
| List<Function> Function([List<Function> x1]) Function<B extends core.int>()
|
| x10;
|
| List<Function> Function({List<T> x}) Function<B extends core.int>() x11;
|
| - core.List<core.int> Function(int y,
|
| - {Function x}) 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 y, {Function x})
|
| + 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(Function x1) Function<B extends core.int>() x14;
|
| - List<T> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>() x15;
|
| + List<T> Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>() x15;
|
| Function(int x1, {int x}) Function<B extends core.int>() x16;
|
| Function([core.List<core.int> x]) Function<B extends core.int>() x17;
|
| void Function(int y, [int x]) Function<B extends core.int>() x18;
|
| @@ -280,7 +257,7 @@ class U22<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);
|
| });
|
| @@ -380,8 +357,8 @@ class U22<T> {
|
| Expect.isTrue(f6 is F6);
|
| Expect.isTrue(confuse(f6) is F6);
|
| // In checked mode, verifies the type.
|
| - int Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>() l6;
|
| + int Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>() l6;
|
| // The static function f6 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x6 = f6 as dynamic;
|
| @@ -391,8 +368,8 @@ class U22<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>());
|
| + Expect.isTrue(m6 is int Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m6) is F6);
|
| // In checked mode, verifies the type.
|
| x6 = m6;
|
| @@ -441,8 +418,8 @@ class U22<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(
|
| - core.List<core.int> x) Function<B extends core.int>());
|
| + Expect.isTrue(m8 is Function Function(core.List<core.int> x)
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -466,8 +443,8 @@ class U22<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;
|
| @@ -492,8 +469,8 @@ class U22<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(
|
| - [List<Function> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m10 is List<Function> Function([List<Function> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| @@ -517,8 +494,8 @@ class U22<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is List<Function> Function(
|
| - {List<T> x}) Function<B extends core.int>());
|
| + Expect.isTrue(m11 is List<Function> Function({List<T> x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -533,7 +510,7 @@ class U22<T> {
|
| Expect.equals(tIsDynamic, m11 is F11<bool>);
|
| Expect.equals(tIsDynamic, confuse(m11) is F11<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x11 = (f11 as dynamic);
|
| });
|
| @@ -561,8 +538,8 @@ class U22<T> {
|
| Expect.isTrue(f12 is F12);
|
| Expect.isTrue(confuse(f12) is F12);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int y,
|
| - {Function x}) Function<B extends core.int>() l12;
|
| + core.List<core.int> Function(int y, {Function x})
|
| + Function<B extends core.int>() l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -572,8 +549,8 @@ class U22<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int y,
|
| - {Function x}) Function<B extends core.int>());
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int y, {Function x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -587,8 +564,8 @@ class U22<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;
|
| @@ -598,8 +575,8 @@ class U22<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;
|
| @@ -614,15 +591,15 @@ class U22<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);
|
| });
|
| @@ -630,8 +607,8 @@ class U22<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);
|
| @@ -669,7 +646,7 @@ class U22<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);
|
| });
|
| @@ -696,8 +673,8 @@ class U22<T> {
|
| Expect.isTrue(f15 is F15);
|
| Expect.isTrue(confuse(f15) is F15);
|
| // In checked mode, verifies the type.
|
| - List<T> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>() l15;
|
| + List<T> Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>() l15;
|
| // The static function f15 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x15 = f15 as dynamic;
|
| @@ -707,8 +684,8 @@ class U22<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m15 is List<T> Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -723,15 +700,15 @@ class U22<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);
|
| });
|
| Expect.throws(() {
|
| x15 = confuse(f15);
|
| });
|
| - List<T> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>() l15;
|
| + List<T> Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>() l15;
|
| Expect.throws(() {
|
| l15 = (f15 as dynamic);
|
| });
|
| @@ -739,8 +716,8 @@ class U22<T> {
|
| l15 = confuse(f15);
|
| });
|
| }
|
| - List<T> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>() l15 = m15;
|
| + List<T> Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>() l15 = m15;
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| x15 = confuse(m15);
|
| @@ -787,8 +764,8 @@ class U22<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;
|
| @@ -838,8 +815,8 @@ class U22<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int x2,
|
| - [List<Function> x3]) Function<B extends core.int>());
|
| + Expect.isTrue(m19 is void Function(int x2, [List<Function> x3])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| @@ -863,8 +840,8 @@ class U22<T> {
|
| }
|
|
|
| Expect.isTrue(m20 is F20);
|
| - Expect.isTrue(m20 is void Function(int x1,
|
| - {List<T> x}) Function<B extends core.int>());
|
| + Expect.isTrue(m20 is void Function(int x1, {List<T> x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m20) is F20);
|
| // In checked mode, verifies the type.
|
| x20 = m20;
|
| @@ -879,7 +856,7 @@ class U22<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);
|
| });
|
|
|