| Index: tests/language/function_type/function_type18_test.dart
|
| diff --git a/tests/language/function_type/function_type18_test.dart b/tests/language/function_type/function_type18_test.dart
|
| index 39a9bb2e17409e41ca998447679597357934a3f2..879edbbac4ffd5b8e8d41dfcf8cfe9505392c8c9 100644
|
| --- a/tests/language/function_type/function_type18_test.dart
|
| +++ b/tests/language/function_type/function_type18_test.dart
|
| @@ -19,64 +19,41 @@ 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 x, [Function x2]);
|
| -typedef F1<T>
|
| - = List<Function> Function(int x1, [int x2]);
|
| -typedef F2<T>
|
| - = core.List<core.int> Function(int x1, [List<T> x2]);
|
| -typedef F3<T>
|
| - = Function([core.List<core.int> x1]);
|
| -typedef F4<T>
|
| - = core.List<core.int> Function<A>(List<Function> x);
|
| -typedef F5<T>
|
| - = int Function(int x1, [Function x]) Function<B extends core.int>();
|
| -typedef F6<T>
|
| - = int Function([core.List<core.int> x1]) Function<B extends core.int>();
|
| -typedef F7<T>
|
| - = Function Function(int x, [int x1]) Function<B extends core.int>();
|
| -typedef F8<T>
|
| - = Function Function(int y,
|
| - {List<Function> x}) Function<B extends core.int>();
|
| -typedef F9<T>
|
| - = List<Function> Function([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(int x,
|
| - [List<T> x1]) Function<B extends core.int>();
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(int x1,
|
| - {Function x}) Function<B extends core.int>();
|
| -typedef F13<T>
|
| - = core.List<core.int> Function([List<T> x]) Function<B extends core.int>();
|
| -typedef F14<T>
|
| - = List<T> Function(int y, [Function x]) Function<B extends core.int>();
|
| -typedef F15<T>
|
| - = List<T> Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>();
|
| -typedef F16<T>
|
| - = Function({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 x1, [int x]) Function<B extends core.int>();
|
| -typedef F19<T>
|
| - = void Function([List<Function> x1]) Function<B extends core.int>();
|
| -typedef F20<T>
|
| - = void Function({List<T> x}) Function<B extends core.int>();
|
| -typedef F21<T>
|
| - = List<Function> Function<A>() Function<B extends core.int>();
|
| -typedef F22<T>
|
| - = Function<A>(A x) Function<B extends core.int>();
|
| -typedef F23<T>
|
| - = void Function<A>(List<A> x) Function<B extends core.int>();
|
| +typedef F0<T> = int Function(int x, [Function x2]);
|
| +typedef F1<T> = List<Function> Function(int x1, [int x2]);
|
| +typedef F2<T> = core.List<core.int> Function(int x1, [List<T> x2]);
|
| +typedef F3<T> = Function([core.List<core.int> x1]);
|
| +typedef F4<T> = core.List<core.int> Function<A>(List<Function> x);
|
| +typedef F5<T> = int Function(int x1, [Function x])
|
| + Function<B extends core.int>();
|
| +typedef F6<T> = int Function([core.List<core.int> x1])
|
| + Function<B extends core.int>();
|
| +typedef F7<T> = Function Function(int x, [int x1])
|
| + Function<B extends core.int>();
|
| +typedef F8<T> = Function Function(int y, {List<Function> x})
|
| + Function<B extends core.int>();
|
| +typedef F9<T> = List<Function> Function([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(int x, [List<T> x1])
|
| + Function<B extends core.int>();
|
| +typedef F12<T> = core.List<core.int> Function(int x1, {Function x})
|
| + Function<B extends core.int>();
|
| +typedef F13<T> = core.List<core.int> Function([List<T> x])
|
| + Function<B extends core.int>();
|
| +typedef F14<T> = List<T> Function(int y, [Function x])
|
| + Function<B extends core.int>();
|
| +typedef F15<T> = List<T> Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>();
|
| +typedef F16<T> = Function({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 x1, [int x]) Function<B extends core.int>();
|
| +typedef F19<T> = void Function([List<Function> x1])
|
| + Function<B extends core.int>();
|
| +typedef F20<T> = void Function({List<T> x}) Function<B extends core.int>();
|
| +typedef F21<T> = List<Function> Function<A>() Function<B extends core.int>();
|
| +typedef F22<T> = Function<A>(A x) Function<B extends core.int>();
|
| +typedef F23<T> = void Function<A>(List<A> x) Function<B extends core.int>();
|
|
|
| int f0(int x, [Function x0]) => null;
|
| List<Function> f1(int x0, [int x1]) => null;
|
| @@ -125,12 +102,12 @@ class U18<T> {
|
| List<Function> Function(List<Function> x1) Function<B extends core.int>() x10;
|
| List<Function> Function(int x, [List<T> x1]) Function<B extends core.int>()
|
| x11;
|
| - core.List<core.int> Function(int x1,
|
| - {Function x}) Function<B extends core.int>() x12;
|
| + core.List<core.int> Function(int x1, {Function x})
|
| + Function<B extends core.int>() x12;
|
| core.List<core.int> Function([List<T> x]) Function<B extends core.int>() x13;
|
| List<T> Function(int y, [Function x]) Function<B extends core.int>() x14;
|
| - List<T> Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>() x15;
|
| + List<T> Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>() x15;
|
| Function({int x}) Function<B extends core.int>() x16;
|
| Function(core.List<core.int> x) Function<B extends core.int>() x17;
|
| void Function(int x1, [int x]) Function<B extends core.int>() x18;
|
| @@ -276,7 +253,7 @@ class U18<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);
|
| });
|
| @@ -361,8 +338,8 @@ class U18<T> {
|
| }
|
|
|
| Expect.isTrue(m5 is F5);
|
| - Expect.isTrue(m5 is int Function(int x1,
|
| - [Function x]) Function<B extends core.int>());
|
| + Expect.isTrue(m5 is int Function(int x1, [Function x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m5) is F5);
|
| // In checked mode, verifies the type.
|
| x5 = m5;
|
| @@ -386,8 +363,8 @@ class U18<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(
|
| - [core.List<core.int> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m6 is int Function([core.List<core.int> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m6) is F6);
|
| // In checked mode, verifies the type.
|
| x6 = m6;
|
| @@ -411,8 +388,8 @@ class U18<T> {
|
| }
|
|
|
| Expect.isTrue(m7 is F7);
|
| - Expect.isTrue(m7 is Function Function(int x,
|
| - [int x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m7 is Function Function(int x, [int x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m7) is F7);
|
| // In checked mode, verifies the type.
|
| x7 = m7;
|
| @@ -437,8 +414,8 @@ class U18<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int y,
|
| - {List<Function> x}) Function<B extends core.int>());
|
| + Expect.isTrue(m8 is Function Function(int y, {List<Function> x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -488,8 +465,8 @@ class U18<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;
|
| @@ -514,8 +491,8 @@ class U18<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is List<Function> Function(int x,
|
| - [List<T> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m11 is List<Function> Function(int x, [List<T> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -530,15 +507,15 @@ class U18<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);
|
| });
|
| Expect.throws(() {
|
| x11 = confuse(f11);
|
| });
|
| - List<Function> Function(int x,
|
| - [List<T> x1]) Function<B extends core.int>() l11;
|
| + List<Function> Function(int x, [List<T> x1])
|
| + Function<B extends core.int>() l11;
|
| Expect.throws(() {
|
| l11 = (f11 as dynamic);
|
| });
|
| @@ -546,8 +523,8 @@ class U18<T> {
|
| l11 = confuse(f11);
|
| });
|
| }
|
| - List<Function> Function(int x,
|
| - [List<T> x1]) Function<B extends core.int>() l11 = m11;
|
| + List<Function> Function(int x, [List<T> x1])
|
| + Function<B extends core.int>() l11 = m11;
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| x11 = confuse(m11);
|
| @@ -559,8 +536,8 @@ class U18<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,
|
| - {Function x}) Function<B extends core.int>() l12;
|
| + core.List<core.int> Function(int x1, {Function x})
|
| + Function<B extends core.int>() l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -570,8 +547,8 @@ class U18<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x1,
|
| - {Function x}) Function<B extends core.int>());
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int x1, {Function x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -596,8 +573,8 @@ class U18<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(
|
| - [List<T> x]) Function<B extends core.int>());
|
| + Expect.isTrue(m13 is core.List<core.int> Function([List<T> x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -612,7 +589,7 @@ class U18<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);
|
| });
|
| @@ -651,8 +628,8 @@ class U18<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(int y,
|
| - [Function x]) Function<B extends core.int>());
|
| + Expect.isTrue(m14 is List<T> Function(int y, [Function x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -667,7 +644,7 @@ class U18<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 U18<T> {
|
| Expect.isTrue(f15 is F15);
|
| Expect.isTrue(confuse(f15) is F15);
|
| // In checked mode, verifies the type.
|
| - List<T> Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>() l15;
|
| + List<T> Function(int x2, [core.List<core.int> x3])
|
| + 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 U18<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>());
|
| + Expect.isTrue(m15 is List<T> Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -723,15 +700,15 @@ class U18<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 x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>() l15;
|
| + List<T> Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>() l15;
|
| Expect.throws(() {
|
| l15 = (f15 as dynamic);
|
| });
|
| @@ -739,8 +716,8 @@ class U18<T> {
|
| l15 = confuse(f15);
|
| });
|
| }
|
| - List<T> Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>() l15 = m15;
|
| + List<T> Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>() l15 = m15;
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| x15 = confuse(m15);
|
| @@ -836,8 +813,8 @@ class U18<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(
|
| - [List<Function> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m19 is void Function([List<Function> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| @@ -877,7 +854,7 @@ class U18<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);
|
| });
|
|
|