| Index: tests/language/function_type/function_type70_test.dart
|
| diff --git a/tests/language/function_type/function_type70_test.dart b/tests/language/function_type/function_type70_test.dart
|
| index 6a5df2bab6ef55d2498716dbe5fa0ff648bbac1e..18cfea07985e7fc9f1bbc26ea08d15818bec8b89 100644
|
| --- a/tests/language/function_type/function_type70_test.dart
|
| +++ b/tests/language/function_type/function_type70_test.dart
|
| @@ -19,62 +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>
|
| - = Function Function(int y, [Function x]);
|
| -typedef F1<T>
|
| - = core.List<core.int> Function(int x0, [int x]);
|
| -typedef F2<T>
|
| - = List<T> Function(int x0, [List<T> x]);
|
| -typedef F3<T>
|
| - = void Function([core.List<core.int> x]);
|
| -typedef F4<T>
|
| - = int Function([int x]) Function<B extends core.int>();
|
| -typedef F5<T>
|
| - = int Function(List<Function> x1) Function<B extends core.int>();
|
| -typedef F6<T>
|
| - = int Function(int x, [List<T> x1]) Function<B extends core.int>();
|
| -typedef F7<T>
|
| - = Function Function(int x1, {Function x}) Function<B extends core.int>();
|
| -typedef F8<T>
|
| - = Function Function([List<T> x]) Function<B extends core.int>();
|
| -typedef F9<T>
|
| - = List<Function> Function(int y,
|
| - [Function x]) Function<B extends core.int>();
|
| -typedef F10<T>
|
| - = List<Function> Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>();
|
| -typedef F11<T>
|
| - = core.List<core.int> Function({int x}) Function<B extends core.int>();
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(
|
| - core.List<core.int> x) Function<B extends core.int>();
|
| -typedef F13<T>
|
| - = List<T> Function(int x1, [int x]) Function<B extends core.int>();
|
| -typedef F14<T>
|
| - = List<T> Function([List<Function> x1]) Function<B extends core.int>();
|
| -typedef F15<T>
|
| - = List<T> Function({List<T> x}) Function<B extends core.int>();
|
| -typedef F16<T>
|
| - = Function(int y, {Function x}) Function<B extends core.int>();
|
| -typedef F17<T>
|
| - = Function(int x1, [List<T> x]) Function<B extends core.int>();
|
| -typedef F18<T>
|
| - = void Function(Function x1) Function<B extends core.int>();
|
| -typedef F19<T>
|
| - = void Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>();
|
| -typedef F20<T>
|
| - = Function Function<A>(Function x) Function<B extends core.int>();
|
| -typedef F21<T>
|
| - = List<T> Function<A>(List<Function> x) Function<B extends core.int>();
|
| -typedef F22<T>
|
| - = List<A> Function<A>(core.List<core.int> x) Function<B extends core.int>();
|
| +typedef F0<T> = Function Function(int y, [Function x]);
|
| +typedef F1<T> = core.List<core.int> Function(int x0, [int x]);
|
| +typedef F2<T> = List<T> Function(int x0, [List<T> x]);
|
| +typedef F3<T> = void Function([core.List<core.int> x]);
|
| +typedef F4<T> = int Function([int x]) Function<B extends core.int>();
|
| +typedef F5<T> = int Function(List<Function> x1) Function<B extends core.int>();
|
| +typedef F6<T> = int Function(int x, [List<T> x1])
|
| + Function<B extends core.int>();
|
| +typedef F7<T> = Function Function(int x1, {Function x})
|
| + Function<B extends core.int>();
|
| +typedef F8<T> = Function Function([List<T> x]) Function<B extends core.int>();
|
| +typedef F9<T> = List<Function> Function(int y, [Function x])
|
| + Function<B extends core.int>();
|
| +typedef F10<T> = List<Function> Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>();
|
| +typedef F11<T> = core.List<core.int> Function({int x})
|
| + Function<B extends core.int>();
|
| +typedef F12<T> = core.List<core.int> Function(core.List<core.int> x)
|
| + Function<B extends core.int>();
|
| +typedef F13<T> = List<T> Function(int x1, [int x])
|
| + Function<B extends core.int>();
|
| +typedef F14<T> = List<T> Function([List<Function> x1])
|
| + Function<B extends core.int>();
|
| +typedef F15<T> = List<T> Function({List<T> x}) Function<B extends core.int>();
|
| +typedef F16<T> = Function(int y, {Function x}) Function<B extends core.int>();
|
| +typedef F17<T> = Function(int x1, [List<T> x]) Function<B extends core.int>();
|
| +typedef F18<T> = void Function(Function x1) Function<B extends core.int>();
|
| +typedef F19<T> = void Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>();
|
| +typedef F20<T> = Function Function<A>(Function x)
|
| + Function<B extends core.int>();
|
| +typedef F21<T> = List<T> Function<A>(List<Function> x)
|
| + Function<B extends core.int>();
|
| +typedef F22<T> = List<A> Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>();
|
|
|
| Function f0(int y, [Function x]) => null;
|
| core.List<core.int> f1(int x0, [int x]) => null;
|
| @@ -119,11 +98,11 @@ class U70<T> {
|
| Function Function([List<T> x]) Function<B extends core.int>() x8;
|
| List<Function> Function(int y, [Function x]) Function<B extends core.int>()
|
| x9;
|
| - List<Function> Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>() x10;
|
| + List<Function> Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>() x10;
|
| core.List<core.int> Function({int x}) Function<B extends core.int>() x11;
|
| - core.List<core.int> Function(
|
| - core.List<core.int> x) Function<B extends core.int>() x12;
|
| + core.List<core.int> Function(core.List<core.int> x)
|
| + Function<B extends core.int>() x12;
|
| List<T> Function(int x1, [int x]) Function<B extends core.int>() x13;
|
| List<T> Function([List<Function> x1]) Function<B extends core.int>() x14;
|
| List<T> Function({List<T> x}) Function<B extends core.int>() x15;
|
| @@ -270,7 +249,7 @@ class U70<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);
|
| });
|
| @@ -396,7 +375,7 @@ class U70<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);
|
| });
|
| @@ -433,8 +412,8 @@ class U70<T> {
|
| }
|
|
|
| Expect.isTrue(m7 is F7);
|
| - Expect.isTrue(m7 is Function Function(int x1,
|
| - {Function x}) Function<B extends core.int>());
|
| + Expect.isTrue(m7 is Function Function(int x1, {Function x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m7) is F7);
|
| // In checked mode, verifies the type.
|
| x7 = m7;
|
| @@ -474,7 +453,7 @@ class U70<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);
|
| });
|
| @@ -512,8 +491,8 @@ class U70<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(int y,
|
| - [Function x]) Function<B extends core.int>());
|
| + Expect.isTrue(m9 is List<Function> Function(int y, [Function x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| @@ -527,8 +506,8 @@ class U70<T> {
|
| Expect.isTrue(f10 is F10);
|
| Expect.isTrue(confuse(f10) is F10);
|
| // In checked mode, verifies the type.
|
| - List<Function> Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>() l10;
|
| + List<Function> Function(int x2, [core.List<core.int> x3])
|
| + Function<B extends core.int>() l10;
|
| // The static function f10 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x10 = f10 as dynamic;
|
| @@ -539,7 +518,8 @@ class U70<T> {
|
|
|
| Expect.isTrue(m10 is F10);
|
| Expect.isTrue(m10 is List<Function> Function(int x2,
|
| - [core.List<core.int> x3]) Function<B extends core.int>());
|
| + [core.List<core.int> x3])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| @@ -563,8 +543,8 @@ class U70<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(
|
| - {int x}) Function<B extends core.int>());
|
| + Expect.isTrue(m11 is core.List<core.int> Function({int x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -578,8 +558,8 @@ class U70<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>() l12;
|
| + core.List<core.int> Function(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;
|
| @@ -589,8 +569,8 @@ class U70<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>());
|
| + Expect.isTrue(m12 is core.List<core.int> Function(core.List<core.int> x)
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -614,8 +594,8 @@ class U70<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is List<T> Function(int x1,
|
| - [int x]) Function<B extends core.int>());
|
| + Expect.isTrue(m13 is List<T> Function(int x1, [int x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -630,7 +610,7 @@ class U70<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);
|
| });
|
| @@ -668,8 +648,8 @@ class U70<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(
|
| - [List<Function> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m14 is List<T> Function([List<Function> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -684,7 +664,7 @@ class U70<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);
|
| });
|
| @@ -739,7 +719,7 @@ class U70<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);
|
| });
|
| @@ -817,7 +797,7 @@ class U70<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);
|
| });
|
| @@ -869,8 +849,8 @@ class U70<T> {
|
| Expect.isTrue(f19 is F19);
|
| Expect.isTrue(confuse(f19) is F19);
|
| // In checked mode, verifies the type.
|
| - void Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>() l19;
|
| + void Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>() l19;
|
| // The static function f19 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x19 = f19 as dynamic;
|
| @@ -880,8 +860,8 @@ class U70<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int x,
|
| - [core.List<core.int> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m19 is void Function(int x, [core.List<core.int> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| @@ -930,8 +910,8 @@ class U70<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is List<T> Function<A>(
|
| - List<Function> x) Function<B extends core.int>());
|
| + Expect.isTrue(m21 is List<T> Function<A>(List<Function> x)
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
| @@ -946,7 +926,7 @@ class U70<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);
|
| });
|
| @@ -986,8 +966,8 @@ class U70<T> {
|
| }
|
|
|
| Expect.isTrue(m22 is F22);
|
| - Expect.isTrue(m22 is List<A> Function<A>(
|
| - core.List<core.int> x) Function<B extends core.int>());
|
| + Expect.isTrue(m22 is List<A> Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m22) is F22);
|
| // In checked mode, verifies the type.
|
| x22 = m22;
|
|
|