| Index: tests/language/function_type/function_type90_test.dart
|
| diff --git a/tests/language/function_type/function_type90_test.dart b/tests/language/function_type/function_type90_test.dart
|
| index 3685c04d6f11c0f48b47770bdd145fdc65059c2b..d82927a299dcd03be5e71c7ea4a62ba9527103e2 100644
|
| --- a/tests/language/function_type/function_type90_test.dart
|
| +++ b/tests/language/function_type/function_type90_test.dart
|
| @@ -19,62 +19,39 @@ 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([core.List<core.int> x]);
|
| -typedef F1<T>
|
| - = core.List<core.int> Function(List<Function> x);
|
| -typedef F2<T>
|
| - = Function(int y, {int x});
|
| -typedef F3<T>
|
| - = void Function(int y, {List<T> x});
|
| -typedef F4<T>
|
| - = int Function(int x2, [int x3]) Function<B extends core.int>();
|
| -typedef F5<T>
|
| - = int Function(int x1, {List<Function> x}) Function<B extends core.int>();
|
| -typedef F6<T>
|
| - = Function Function(int x) Function<B extends core.int>();
|
| -typedef F7<T>
|
| - = Function Function(int y,
|
| - [List<Function> x]) Function<B extends core.int>();
|
| -typedef F8<T>
|
| - = Function Function(int x2, [List<T> x3]) Function<B extends core.int>();
|
| -typedef F9<T>
|
| - = List<Function> Function({Function x}) Function<B extends core.int>();
|
| -typedef F10<T>
|
| - = List<Function> Function(List<T> x) Function<B extends core.int>();
|
| -typedef F11<T>
|
| - = core.List<core.int> Function(int x1,
|
| - [Function x]) Function<B extends core.int>();
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(
|
| - [core.List<core.int> x1]) Function<B extends core.int>();
|
| -typedef F13<T>
|
| - = List<T> Function(int x, [int x1]) Function<B extends core.int>();
|
| -typedef F14<T>
|
| - = List<T> Function(int y,
|
| - {List<Function> x}) Function<B extends core.int>();
|
| -typedef F15<T>
|
| - = Function([int x]) Function<B extends core.int>();
|
| -typedef F16<T>
|
| - = Function(List<Function> x1) Function<B extends core.int>();
|
| -typedef F17<T>
|
| - = Function(int x, [List<T> x1]) Function<B extends core.int>();
|
| -typedef F18<T>
|
| - = void Function(int x1, {Function x}) Function<B extends core.int>();
|
| -typedef F19<T>
|
| - = void Function([List<T> x]) Function<B extends core.int>();
|
| -typedef F20<T>
|
| - = Function Function<A>(A x) Function<B extends core.int>();
|
| -typedef F21<T>
|
| - = List<T> Function<A>(List<A> x) Function<B extends core.int>();
|
| -typedef F22<T>
|
| - = void Function<A>(int x) Function<B extends core.int>();
|
| +typedef F0<T> = Function Function([core.List<core.int> x]);
|
| +typedef F1<T> = core.List<core.int> Function(List<Function> x);
|
| +typedef F2<T> = Function(int y, {int x});
|
| +typedef F3<T> = void Function(int y, {List<T> x});
|
| +typedef F4<T> = int Function(int x2, [int x3]) Function<B extends core.int>();
|
| +typedef F5<T> = int Function(int x1, {List<Function> x})
|
| + Function<B extends core.int>();
|
| +typedef F6<T> = Function Function(int x) Function<B extends core.int>();
|
| +typedef F7<T> = Function Function(int y, [List<Function> x])
|
| + Function<B extends core.int>();
|
| +typedef F8<T> = Function Function(int x2, [List<T> x3])
|
| + Function<B extends core.int>();
|
| +typedef F9<T> = List<Function> Function({Function x})
|
| + Function<B extends core.int>();
|
| +typedef F10<T> = List<Function> Function(List<T> x)
|
| + Function<B extends core.int>();
|
| +typedef F11<T> = core.List<core.int> Function(int x1, [Function x])
|
| + Function<B extends core.int>();
|
| +typedef F12<T> = core.List<core.int> Function([core.List<core.int> x1])
|
| + Function<B extends core.int>();
|
| +typedef F13<T> = List<T> Function(int x, [int x1])
|
| + Function<B extends core.int>();
|
| +typedef F14<T> = List<T> Function(int y, {List<Function> x})
|
| + Function<B extends core.int>();
|
| +typedef F15<T> = Function([int x]) Function<B extends core.int>();
|
| +typedef F16<T> = Function(List<Function> x1) Function<B extends core.int>();
|
| +typedef F17<T> = Function(int x, [List<T> x1]) Function<B extends core.int>();
|
| +typedef F18<T> = void Function(int x1, {Function x})
|
| + Function<B extends core.int>();
|
| +typedef F19<T> = void Function([List<T> x]) Function<B extends core.int>();
|
| +typedef F20<T> = Function Function<A>(A x) Function<B extends core.int>();
|
| +typedef F21<T> = List<T> Function<A>(List<A> x) Function<B extends core.int>();
|
| +typedef F22<T> = void Function<A>(int x) Function<B extends core.int>();
|
|
|
| Function f0([core.List<core.int> x]) => null;
|
| core.List<core.int> f1(List<Function> x) => null;
|
| @@ -119,10 +96,10 @@ class U90<T> {
|
| Function Function(int x2, [List<T> x3]) Function<B extends core.int>() x8;
|
| List<Function> Function({Function x}) Function<B extends core.int>() x9;
|
| List<Function> Function(List<T> x) Function<B extends core.int>() x10;
|
| - core.List<core.int> Function(int x1,
|
| - [Function x]) Function<B extends core.int>() x11;
|
| - core.List<core.int> Function(
|
| - [core.List<core.int> x1]) Function<B extends core.int>() x12;
|
| + core.List<core.int> Function(int x1, [Function x])
|
| + Function<B extends core.int>() x11;
|
| + core.List<core.int> Function([core.List<core.int> x1])
|
| + Function<B extends core.int>() x12;
|
| List<T> Function(int x, [int x1]) Function<B extends core.int>() x13;
|
| List<T> Function(int y, {List<Function> x}) Function<B extends core.int>()
|
| x14;
|
| @@ -292,7 +269,7 @@ class U90<T> {
|
| Expect.equals(tIsDynamic, m3 is F3<bool>);
|
| Expect.equals(tIsDynamic, confuse(m3) is F3<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x3 = (f3 as dynamic);
|
| });
|
| @@ -354,8 +331,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m5 is F5);
|
| - Expect.isTrue(m5 is int Function(int x1,
|
| - {List<Function> x}) Function<B extends core.int>());
|
| + Expect.isTrue(m5 is int Function(int x1, {List<Function> x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m5) is F5);
|
| // In checked mode, verifies the type.
|
| x5 = m5;
|
| @@ -405,8 +382,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m7 is F7);
|
| - Expect.isTrue(m7 is Function Function(int y,
|
| - [List<Function> x]) Function<B extends core.int>());
|
| + Expect.isTrue(m7 is Function Function(int y, [List<Function> x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m7) is F7);
|
| // In checked mode, verifies the type.
|
| x7 = m7;
|
| @@ -430,8 +407,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int x2,
|
| - [List<T> x3]) Function<B extends core.int>());
|
| + Expect.isTrue(m8 is Function Function(int x2, [List<T> x3])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -446,7 +423,7 @@ class U90<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);
|
| });
|
| @@ -485,8 +462,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(
|
| - {Function x}) Function<B extends core.int>());
|
| + Expect.isTrue(m9 is List<Function> Function({Function x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| @@ -510,8 +487,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(
|
| - List<T> x) Function<B extends core.int>());
|
| + Expect.isTrue(m10 is List<Function> Function(List<T> x)
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| @@ -526,7 +503,7 @@ class U90<T> {
|
| Expect.equals(tIsDynamic, m10 is F10<bool>);
|
| Expect.equals(tIsDynamic, confuse(m10) is F10<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x10 = (f10 as dynamic);
|
| });
|
| @@ -554,8 +531,8 @@ class U90<T> {
|
| Expect.isTrue(f11 is F11);
|
| Expect.isTrue(confuse(f11) is F11);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int x1,
|
| - [Function x]) Function<B extends core.int>() l11;
|
| + core.List<core.int> Function(int x1, [Function x])
|
| + Function<B extends core.int>() l11;
|
| // The static function f11 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x11 = f11 as dynamic;
|
| @@ -565,8 +542,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(int x1,
|
| - [Function x]) Function<B extends core.int>());
|
| + Expect.isTrue(m11 is core.List<core.int> Function(int x1, [Function x])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -580,8 +557,8 @@ class U90<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> x1]) Function<B extends core.int>() l12;
|
| + core.List<core.int> Function([core.List<core.int> x1])
|
| + Function<B extends core.int>() l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -591,8 +568,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(
|
| - [core.List<core.int> x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m12 is core.List<core.int> Function([core.List<core.int> x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -616,8 +593,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is List<T> Function(int x,
|
| - [int x1]) Function<B extends core.int>());
|
| + Expect.isTrue(m13 is List<T> Function(int x, [int x1])
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -632,7 +609,7 @@ class U90<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);
|
| });
|
| @@ -671,8 +648,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(int y,
|
| - {List<Function> x}) Function<B extends core.int>());
|
| + Expect.isTrue(m14 is List<T> Function(int y, {List<Function> x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -687,15 +664,15 @@ class U90<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 y,
|
| - {List<Function> x}) Function<B extends core.int>() l14;
|
| + List<T> Function(int y, {List<Function> x})
|
| + Function<B extends core.int>() l14;
|
| Expect.throws(() {
|
| l14 = (f14 as dynamic);
|
| });
|
| @@ -791,7 +768,7 @@ class U90<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);
|
| });
|
| @@ -828,8 +805,8 @@ class U90<T> {
|
| }
|
|
|
| Expect.isTrue(m18 is F18);
|
| - Expect.isTrue(m18 is void Function(int x1,
|
| - {Function x}) Function<B extends core.int>());
|
| + Expect.isTrue(m18 is void Function(int x1, {Function x})
|
| + Function<B extends core.int>());
|
| Expect.isTrue(confuse(m18) is F18);
|
| // In checked mode, verifies the type.
|
| x18 = m18;
|
| @@ -869,7 +846,7 @@ class U90<T> {
|
| Expect.equals(tIsDynamic, m19 is F19<bool>);
|
| Expect.equals(tIsDynamic, confuse(m19) is F19<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x19 = (f19 as dynamic);
|
| });
|
| @@ -947,7 +924,7 @@ class U90<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);
|
| });
|
|
|