| Index: tests/language/function_type/function_type75_test.dart
|
| diff --git a/tests/language/function_type/function_type75_test.dart b/tests/language/function_type/function_type75_test.dart
|
| index dc682e93657c994030b523838958c030aa6266f4..c99b98235ca780a7b8bb5fdc5aba91da9aa41008 100644
|
| --- a/tests/language/function_type/function_type75_test.dart
|
| +++ b/tests/language/function_type/function_type75_test.dart
|
| @@ -19,67 +19,46 @@ 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({Function x});
|
| -typedef F1<T>
|
| - = core.List<core.int> Function(int x, [int x2]);
|
| -typedef F2<T>
|
| - = List<T> Function(int x, [List<T> x2]);
|
| -typedef F3<T>
|
| - = void Function(int x1, [core.List<core.int> x2]);
|
| -typedef F4<T>
|
| - = int Function(int x1, [int x]) Function<B extends core.int>(int x);
|
| -typedef F5<T>
|
| - = int Function([List<Function> x1]) Function<B extends core.int>(int x);
|
| -typedef F6<T>
|
| - = int Function({List<T> x}) Function<B extends core.int>(int x);
|
| -typedef F7<T>
|
| - = Function Function(int y, {Function x}) Function<B extends core.int>(
|
| - int x);
|
| -typedef F8<T>
|
| - = Function Function(int x1, [List<T> x]) Function<B extends core.int>(
|
| - int x);
|
| -typedef F9<T>
|
| - = List<Function> Function(Function x1) Function<B extends core.int>(int x);
|
| -typedef F10<T>
|
| - = List<Function> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>(int x);
|
| -typedef F11<T>
|
| - = core.List<core.int> Function(int x1,
|
| - {int x}) Function<B extends core.int>(int x);
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x);
|
| -typedef F13<T>
|
| - = List<T> Function(int y, [int x]) Function<B extends core.int>(int x);
|
| -typedef F14<T>
|
| - = List<T> Function(int x2,
|
| - [List<Function> x3]) Function<B extends core.int>(int x);
|
| -typedef F15<T>
|
| - = List<T> Function(int x1, {List<T> x}) Function<B extends core.int>(int x);
|
| -typedef F16<T>
|
| - = Function(List<Function> x) Function<B extends core.int>(int x);
|
| -typedef F17<T>
|
| - = Function(int y, [List<T> x]) Function<B extends core.int>(int x);
|
| -typedef F18<T>
|
| - = void Function([Function x1]) Function<B extends core.int>(int x);
|
| -typedef F19<T>
|
| - = void Function({core.List<core.int> x}) Function<B extends core.int>(
|
| - int x);
|
| -typedef F20<T>
|
| - = Function Function<A>(List<Function> x) Function<B extends core.int>(
|
| - int x);
|
| -typedef F21<T>
|
| - = List<T> Function<A>(core.List<core.int> x) Function<B extends core.int>(
|
| - int x);
|
| -typedef F22<T>
|
| - = List<A> Function<A>(List<T> x) Function<B extends core.int>(int x);
|
| +typedef F0<T> = Function Function({Function x});
|
| +typedef F1<T> = core.List<core.int> Function(int x, [int x2]);
|
| +typedef F2<T> = List<T> Function(int x, [List<T> x2]);
|
| +typedef F3<T> = void Function(int x1, [core.List<core.int> x2]);
|
| +typedef F4<T> = int Function(int x1, [int x]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F5<T> = int Function([List<Function> x1]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F6<T> = int Function({List<T> x}) Function<B extends core.int>(int x);
|
| +typedef F7<T> = Function Function(int y, {Function x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F8<T> = Function Function(int x1, [List<T> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F9<T> = List<Function> Function(Function x1)
|
| + Function<B extends core.int>(int x);
|
| +typedef F10<T> = List<Function> Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>(int x);
|
| +typedef F11<T> = core.List<core.int> Function(int x1, {int x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F12<T> = core.List<core.int> Function([core.List<core.int> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F13<T> = List<T> Function(int y, [int x]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F14<T> = List<T> Function(int x2, [List<Function> x3])
|
| + Function<B extends core.int>(int x);
|
| +typedef F15<T> = List<T> Function(int x1, {List<T> x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F16<T> = Function(List<Function> x) Function<B extends core.int>(int x);
|
| +typedef F17<T> = Function(int y, [List<T> x]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F18<T> = void Function([Function x1]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F19<T> = void Function({core.List<core.int> x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F20<T> = Function Function<A>(List<Function> x)
|
| + Function<B extends core.int>(int x);
|
| +typedef F21<T> = List<T> Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>(int x);
|
| +typedef F22<T> = List<A> Function<A>(List<T> x) Function<B extends core.int>(
|
| + int x);
|
|
|
| Function f0({Function x}) => null;
|
| core.List<core.int> f1(int x, [int x0]) => null;
|
| @@ -128,12 +107,12 @@ class U75<T> {
|
| Function Function(int y, {Function x}) Function<B extends core.int>(int x) x7;
|
| Function Function(int x1, [List<T> x]) Function<B extends core.int>(int x) x8;
|
| List<Function> Function(Function x1) Function<B extends core.int>(int x) x9;
|
| - List<Function> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>(int x) x10;
|
| + List<Function> Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>(int x) x10;
|
| core.List<core.int> Function(int x1, {int x}) Function<B extends core.int>(
|
| int x) x11;
|
| - core.List<core.int> Function(
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x) x12;
|
| + core.List<core.int> Function([core.List<core.int> x])
|
| + Function<B extends core.int>(int x) x12;
|
| List<T> Function(int y, [int x]) Function<B extends core.int>(int x) x13;
|
| List<T> Function(int x2, [List<Function> x3]) Function<B extends core.int>(
|
| int x) x14;
|
| @@ -288,7 +267,7 @@ class U75<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);
|
| });
|
| @@ -349,8 +328,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m4 is F4);
|
| - Expect.isTrue(m4 is int Function(int x1,
|
| - [int x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m4 is int Function(int x1, [int x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m4) is F4);
|
| // In checked mode, verifies the type.
|
| x4 = m4;
|
| @@ -374,8 +353,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m5 is F5);
|
| - Expect.isTrue(m5 is int Function(
|
| - [List<Function> x1]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m5 is int Function([List<Function> x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m5) is F5);
|
| // In checked mode, verifies the type.
|
| x5 = m5;
|
| @@ -415,7 +394,7 @@ class U75<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);
|
| });
|
| @@ -453,8 +432,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m7 is F7);
|
| - Expect.isTrue(m7 is Function Function(int y,
|
| - {Function x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m7 is Function Function(int y, {Function x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m7) is F7);
|
| // In checked mode, verifies the type.
|
| x7 = m7;
|
| @@ -479,8 +458,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int x1,
|
| - [List<T> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m8 is Function Function(int x1, [List<T> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -495,7 +474,7 @@ class U75<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);
|
| });
|
| @@ -534,8 +513,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(
|
| - Function x1) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m9 is List<Function> Function(Function x1)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| @@ -549,8 +528,8 @@ class U75<T> {
|
| Expect.isTrue(f10 is F10);
|
| Expect.isTrue(confuse(f10) is F10);
|
| // In checked mode, verifies the type.
|
| - List<Function> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>(int x) l10;
|
| + List<Function> Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>(int x) l10;
|
| // The static function f10 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x10 = f10 as dynamic;
|
| @@ -561,7 +540,8 @@ class U75<T> {
|
|
|
| Expect.isTrue(m10 is F10);
|
| Expect.isTrue(m10 is List<Function> Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>(int x));
|
| + [core.List<core.int> x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| @@ -586,8 +566,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(int x1,
|
| - {int x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m11 is core.List<core.int> Function(int x1, {int x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -601,8 +581,8 @@ class U75<T> {
|
| Expect.isTrue(f12 is F12);
|
| Expect.isTrue(confuse(f12) is F12);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x) l12;
|
| + core.List<core.int> Function([core.List<core.int> x])
|
| + Function<B extends core.int>(int x) l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -612,8 +592,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function([core.List<core.int> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -637,8 +617,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is List<T> Function(int y,
|
| - [int x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m13 is List<T> Function(int y, [int x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -653,7 +633,7 @@ class U75<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);
|
| });
|
| @@ -693,8 +673,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(int x2,
|
| - [List<Function> x3]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m14 is List<T> Function(int x2, [List<Function> x3])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -709,15 +689,15 @@ class U75<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 x2,
|
| - [List<Function> x3]) Function<B extends core.int>(int x) l14;
|
| + List<T> Function(int x2, [List<Function> x3])
|
| + Function<B extends core.int>(int x) l14;
|
| Expect.throws(() {
|
| l14 = (f14 as dynamic);
|
| });
|
| @@ -725,8 +705,8 @@ class U75<T> {
|
| l14 = confuse(f14);
|
| });
|
| }
|
| - List<T> Function(int x2,
|
| - [List<Function> x3]) Function<B extends core.int>(int x) l14 = m14;
|
| + List<T> Function(int x2, [List<Function> x3])
|
| + Function<B extends core.int>(int x) l14 = m14;
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| x14 = confuse(m14);
|
| @@ -749,8 +729,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int x1,
|
| - {List<T> x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m15 is List<T> Function(int x1, {List<T> x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -765,7 +745,7 @@ class U75<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);
|
| });
|
| @@ -829,8 +809,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m17 is F17);
|
| - Expect.isTrue(m17 is Function(int y,
|
| - [List<T> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m17 is Function(int y, [List<T> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m17) is F17);
|
| // In checked mode, verifies the type.
|
| x17 = m17;
|
| @@ -845,7 +825,7 @@ class U75<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);
|
| });
|
| @@ -883,8 +863,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m18 is F18);
|
| - Expect.isTrue(m18 is void Function(
|
| - [Function x1]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m18 is void Function([Function x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m18) is F18);
|
| // In checked mode, verifies the type.
|
| x18 = m18;
|
| @@ -909,8 +889,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(
|
| - {core.List<core.int> x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m19 is void Function({core.List<core.int> x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| @@ -935,8 +915,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m20 is F20);
|
| - Expect.isTrue(m20 is Function Function<A>(
|
| - List<Function> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m20 is Function Function<A>(List<Function> x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m20) is F20);
|
| // In checked mode, verifies the type.
|
| x20 = m20;
|
| @@ -961,8 +941,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is List<T> Function<A>(
|
| - core.List<core.int> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m21 is List<T> Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
| @@ -977,7 +957,7 @@ class U75<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);
|
| });
|
| @@ -1016,8 +996,8 @@ class U75<T> {
|
| }
|
|
|
| Expect.isTrue(m22 is F22);
|
| - Expect.isTrue(m22 is List<A> Function<A>(
|
| - List<T> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m22 is List<A> Function<A>(List<T> x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m22) is F22);
|
| // In checked mode, verifies the type.
|
| x22 = m22;
|
| @@ -1032,7 +1012,7 @@ class U75<T> {
|
| Expect.equals(tIsDynamic, m22 is F22<bool>);
|
| Expect.equals(tIsDynamic, confuse(m22) is F22<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x22 = (f22 as dynamic);
|
| });
|
|
|