| Index: tests/language/function_type/function_type78_test.dart
|
| diff --git a/tests/language/function_type/function_type78_test.dart b/tests/language/function_type/function_type78_test.dart
|
| index 37811c758db4ba1bb5e7a3fb9818afc4b4c6c4ab..ee0b0be48a9f1ecc09acb1127e627e06cf56789e 100644
|
| --- a/tests/language/function_type/function_type78_test.dart
|
| +++ b/tests/language/function_type/function_type78_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>
|
| - = Function Function(List<Function> x);
|
| -typedef F1<T>
|
| - = core.List<core.int> Function(int y, {int x});
|
| -typedef F2<T>
|
| - = List<T> Function(int y, {List<T> x});
|
| -typedef F3<T>
|
| - = void Function(int x0, {core.List<core.int> x});
|
| -typedef F4<T>
|
| - = int Function(int y, [int x]) Function<B extends core.int>();
|
| -typedef F5<T>
|
| - = int Function(int x2, [List<Function> x3]) 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(List<Function> x) Function<B extends core.int>();
|
| -typedef F8<T>
|
| - = Function Function(int y, [List<T> x]) Function<B extends core.int>();
|
| -typedef F9<T>
|
| - = List<Function> Function([Function x1]) 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 x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>();
|
| -typedef F13<T>
|
| - = List<T> Function(int x1) Function<B extends core.int>();
|
| -typedef F14<T>
|
| - = List<T> Function(int x,
|
| - [List<Function> x1]) 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([List<Function> x]) Function<B extends core.int>();
|
| -typedef F17<T>
|
| - = Function(List<T> x1) Function<B extends core.int>();
|
| -typedef F18<T>
|
| - = void Function(int x2, [Function x3]) 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>
|
| - = Function Function<A>(
|
| - core.List<core.int> x) Function<B extends core.int>();
|
| -typedef F21<T>
|
| - = List<T> Function<A>(List<T> x) Function<B extends core.int>();
|
| -typedef F22<T>
|
| - = List<A> Function<A>() Function<B extends core.int>();
|
| +typedef F0<T> = Function Function(List<Function> x);
|
| +typedef F1<T> = core.List<core.int> Function(int y, {int x});
|
| +typedef F2<T> = List<T> Function(int y, {List<T> x});
|
| +typedef F3<T> = void Function(int x0, {core.List<core.int> x});
|
| +typedef F4<T> = int Function(int y, [int x]) Function<B extends core.int>();
|
| +typedef F5<T> = int Function(int x2, [List<Function> x3])
|
| + 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(List<Function> x)
|
| + Function<B extends core.int>();
|
| +typedef F8<T> = Function Function(int y, [List<T> x])
|
| + Function<B extends core.int>();
|
| +typedef F9<T> = List<Function> Function([Function x1])
|
| + 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 x1, [core.List<core.int> x])
|
| + Function<B extends core.int>();
|
| +typedef F13<T> = List<T> Function(int x1) Function<B extends core.int>();
|
| +typedef F14<T> = List<T> Function(int x, [List<Function> x1])
|
| + 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([List<Function> x]) Function<B extends core.int>();
|
| +typedef F17<T> = Function(List<T> x1) Function<B extends core.int>();
|
| +typedef F18<T> = void Function(int x2, [Function x3])
|
| + 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> = Function Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>();
|
| +typedef F21<T> = List<T> Function<A>(List<T> x) Function<B extends core.int>();
|
| +typedef F22<T> = List<A> Function<A>() Function<B extends core.int>();
|
|
|
| Function f0(List<Function> x) => null;
|
| core.List<core.int> f1(int y, {int x}) => null;
|
| @@ -121,12 +99,12 @@ class U78<T> {
|
| Function Function(List<Function> x) Function<B extends core.int>() x7;
|
| Function Function(int y, [List<T> x]) Function<B extends core.int>() x8;
|
| List<Function> Function([Function x1]) 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 x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>() x12;
|
| + core.List<core.int> Function(int x1, [core.List<core.int> x])
|
| + Function<B extends core.int>() x12;
|
| List<T> Function(int x1) Function<B extends core.int>() x13;
|
| List<T> Function(int x, [List<Function> x1]) Function<B extends core.int>()
|
| x14;
|
| @@ -277,7 +255,7 @@ class U78<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);
|
| });
|
| @@ -363,8 +341,8 @@ class U78<T> {
|
| }
|
|
|
| Expect.isTrue(m5 is F5);
|
| - Expect.isTrue(m5 is int Function(int x2,
|
| - [List<Function> x3]) Function<B extends core.int>());
|
| + Expect.isTrue(m5 is int Function(int x2, [List<Function> x3])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m5) is F5);
|
| // In checked mode, verifies the type.
|
| x5 = m5;
|
| @@ -404,7 +382,7 @@ class U78<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);
|
| });
|
| @@ -441,8 +419,8 @@ class U78<T> {
|
| }
|
|
|
| Expect.isTrue(m7 is F7);
|
| - Expect.isTrue(m7 is Function Function(
|
| - List<Function> x) Function<B extends core.int>());
|
| + Expect.isTrue(m7 is Function Function(List<Function> x)
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m7) is F7);
|
| // In checked mode, verifies the type.
|
| x7 = m7;
|
| @@ -466,8 +444,8 @@ class U78<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int y,
|
| - [List<T> x]) Function<B extends core.int>());
|
| + Expect.isTrue(m8 is Function Function(int y, [List<T> x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -482,7 +460,7 @@ class U78<T> {
|
| Expect.equals(tIsDynamic, m8 is F8<bool>);
|
| Expect.equals(tIsDynamic, confuse(m8) is F8<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x8 = (f8 as dynamic);
|
| });
|
| @@ -520,8 +498,8 @@ class U78<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(
|
| - [Function x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m9 is List<Function> Function([Function x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| @@ -535,8 +513,8 @@ class U78<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;
|
| @@ -546,8 +524,8 @@ class U78<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;
|
| @@ -572,8 +550,8 @@ class U78<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;
|
| @@ -587,8 +565,8 @@ class U78<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,
|
| - [core.List<core.int> x]) Function<B extends core.int>() l12;
|
| + core.List<core.int> Function(int x1, [core.List<core.int> x])
|
| + Function<B extends core.int>() l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -599,7 +577,8 @@ class U78<T> {
|
|
|
| Expect.isTrue(m12 is F12);
|
| Expect.isTrue(m12 is core.List<core.int> Function(int x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>());
|
| + [core.List<core.int> x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -639,7 +618,7 @@ class U78<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);
|
| });
|
| @@ -677,8 +656,8 @@ class U78<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(int x,
|
| - [List<Function> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m14 is List<T> Function(int x, [List<Function> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -693,15 +672,15 @@ class U78<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);
|
| });
|
| Expect.throws(() {
|
| x14 = confuse(f14);
|
| });
|
| - List<T> Function(int x,
|
| - [List<Function> x1]) Function<B extends core.int>() l14;
|
| + List<T> Function(int x, [List<Function> x1])
|
| + Function<B extends core.int>() l14;
|
| Expect.throws(() {
|
| l14 = (f14 as dynamic);
|
| });
|
| @@ -709,8 +688,8 @@ class U78<T> {
|
| l14 = confuse(f14);
|
| });
|
| }
|
| - List<T> Function(int x,
|
| - [List<Function> x1]) Function<B extends core.int>() l14 = m14;
|
| + List<T> Function(int x, [List<Function> x1])
|
| + Function<B extends core.int>() l14 = m14;
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| x14 = confuse(m14);
|
| @@ -732,8 +711,8 @@ class U78<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;
|
| @@ -748,7 +727,7 @@ class U78<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);
|
| });
|
| @@ -826,7 +805,7 @@ class U78<T> {
|
| Expect.equals(tIsDynamic, m17 is F17<bool>);
|
| Expect.equals(tIsDynamic, confuse(m17) is F17<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x17 = (f17 as dynamic);
|
| });
|
| @@ -863,8 +842,8 @@ class U78<T> {
|
| }
|
|
|
| Expect.isTrue(m18 is F18);
|
| - Expect.isTrue(m18 is void Function(int x2,
|
| - [Function x3]) Function<B extends core.int>());
|
| + Expect.isTrue(m18 is void Function(int x2, [Function x3])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m18) is F18);
|
| // In checked mode, verifies the type.
|
| x18 = m18;
|
| @@ -878,8 +857,8 @@ class U78<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;
|
| @@ -889,8 +868,8 @@ class U78<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;
|
| @@ -915,8 +894,8 @@ class U78<T> {
|
| }
|
|
|
| Expect.isTrue(m20 is F20);
|
| - Expect.isTrue(m20 is Function Function<A>(
|
| - core.List<core.int> x) Function<B extends core.int>());
|
| + Expect.isTrue(m20 is Function Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m20) is F20);
|
| // In checked mode, verifies the type.
|
| x20 = m20;
|
| @@ -956,7 +935,7 @@ class U78<T> {
|
| Expect.equals(tIsDynamic, m21 is F21<bool>);
|
| Expect.equals(tIsDynamic, confuse(m21) is F21<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x21 = (f21 as dynamic);
|
| });
|
|
|