| Index: tests/language/function_type/function_type11_test.dart
|
| diff --git a/tests/language/function_type/function_type11_test.dart b/tests/language/function_type/function_type11_test.dart
|
| index 3471ed9a2531299318dd0857bcc7e2c113e4e5ca..f468490492411169914a3f8d35d3fa1d1062bc00 100644
|
| --- a/tests/language/function_type/function_type11_test.dart
|
| +++ b/tests/language/function_type/function_type11_test.dart
|
| @@ -19,67 +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>
|
| - = int Function(Function x);
|
| -typedef F1<T>
|
| - = Function Function();
|
| -typedef F2<T>
|
| - = core.List<core.int> Function(int y, {core.List<core.int> x});
|
| -typedef F3<T>
|
| - = Function(int x0, {List<Function> x});
|
| -typedef F4<T>
|
| - = List<Function> Function<A>(core.List<core.int> x);
|
| -typedef F5<T>
|
| - = int Function(Function x) Function<B extends core.int>(int x);
|
| -typedef F6<T>
|
| - = int Function(int y, [core.List<core.int> x]) Function<B extends core.int>(
|
| - int x);
|
| -typedef F7<T>
|
| - = Function Function([int x1]) Function<B extends core.int>(int x);
|
| -typedef F8<T>
|
| - = Function Function({List<Function> x}) Function<B extends core.int>(int x);
|
| -typedef F9<T>
|
| - = Function Function() Function<B extends core.int>(int x);
|
| -typedef F10<T>
|
| - = List<Function> Function(int x1,
|
| - [List<Function> x]) Function<B extends core.int>(int x);
|
| -typedef F11<T>
|
| - = List<Function> Function([List<T> x1]) Function<B extends core.int>(int x);
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(int x,
|
| - [Function x1]) Function<B extends core.int>(int x);
|
| -typedef F13<T>
|
| - = core.List<core.int> Function(int y,
|
| - {core.List<core.int> x}) Function<B extends core.int>(int x);
|
| -typedef F14<T>
|
| - = List<T> Function([Function x]) Function<B extends core.int>(int x);
|
| -typedef F15<T>
|
| - = List<T> Function(core.List<core.int> x1) Function<B extends core.int>(
|
| - int x);
|
| -typedef F16<T>
|
| - = Function(int x2, [int x3]) Function<B extends core.int>(int x);
|
| -typedef F17<T>
|
| - = Function(int x1, {List<Function> x}) Function<B extends core.int>(int x);
|
| -typedef F18<T>
|
| - = void Function(int x) Function<B extends core.int>(int x);
|
| -typedef F19<T>
|
| - = void Function(int y, [List<Function> x]) Function<B extends core.int>(
|
| - int x);
|
| -typedef F20<T>
|
| - = void Function(int x2, [List<T> x3]) Function<B extends core.int>(int x);
|
| -typedef F21<T>
|
| - = List<Function> Function<A>(
|
| - core.List<core.int> x) Function<B extends core.int>(int x);
|
| -typedef F22<T>
|
| - = Function<A>(List<T> x) Function<B extends core.int>(int x);
|
| -typedef F23<T>
|
| - = void Function<A>() Function<B extends core.int>(int x);
|
| +typedef F0<T> = int Function(Function x);
|
| +typedef F1<T> = Function Function();
|
| +typedef F2<T> = core.List<core.int> Function(int y, {core.List<core.int> x});
|
| +typedef F3<T> = Function(int x0, {List<Function> x});
|
| +typedef F4<T> = List<Function> Function<A>(core.List<core.int> x);
|
| +typedef F5<T> = int Function(Function x) Function<B extends core.int>(int x);
|
| +typedef F6<T> = int Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F7<T> = Function Function([int x1]) Function<B extends core.int>(int x);
|
| +typedef F8<T> = Function Function({List<Function> x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F9<T> = Function Function() Function<B extends core.int>(int x);
|
| +typedef F10<T> = List<Function> Function(int x1, [List<Function> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F11<T> = List<Function> Function([List<T> x1])
|
| + Function<B extends core.int>(int x);
|
| +typedef F12<T> = core.List<core.int> Function(int x, [Function x1])
|
| + Function<B extends core.int>(int x);
|
| +typedef F13<T> = core.List<core.int> Function(int y, {core.List<core.int> x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F14<T> = List<T> Function([Function x]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F15<T> = List<T> Function(core.List<core.int> x1)
|
| + Function<B extends core.int>(int x);
|
| +typedef F16<T> = Function(int x2, [int x3]) Function<B extends core.int>(int x);
|
| +typedef F17<T> = Function(int x1, {List<Function> x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F18<T> = void Function(int x) Function<B extends core.int>(int x);
|
| +typedef F19<T> = void Function(int y, [List<Function> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F20<T> = void Function(int x2, [List<T> x3])
|
| + Function<B extends core.int>(int x);
|
| +typedef F21<T> = List<Function> Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>(int x);
|
| +typedef F22<T> = Function<A>(List<T> x) Function<B extends core.int>(int x);
|
| +typedef F23<T> = void Function<A>() Function<B extends core.int>(int x);
|
|
|
| int f0(Function x) => null;
|
| Function f1() => null;
|
| @@ -131,13 +106,13 @@ class U11<T> {
|
| Function Function([int x1]) Function<B extends core.int>(int x) x7;
|
| Function Function({List<Function> x}) Function<B extends core.int>(int x) x8;
|
| Function Function() Function<B extends core.int>(int x) x9;
|
| - List<Function> Function(int x1,
|
| - [List<Function> x]) Function<B extends core.int>(int x) x10;
|
| + List<Function> Function(int x1, [List<Function> x])
|
| + Function<B extends core.int>(int x) x10;
|
| List<Function> Function([List<T> x1]) Function<B extends core.int>(int x) x11;
|
| - core.List<core.int> Function(int x,
|
| - [Function x1]) Function<B extends core.int>(int x) x12;
|
| - core.List<core.int> Function(int y,
|
| - {core.List<core.int> x}) Function<B extends core.int>(int x) x13;
|
| + core.List<core.int> Function(int x, [Function x1])
|
| + Function<B extends core.int>(int x) x12;
|
| + core.List<core.int> Function(int y, {core.List<core.int> x})
|
| + Function<B extends core.int>(int x) x13;
|
| List<T> Function([Function x]) Function<B extends core.int>(int x) x14;
|
| List<T> Function(core.List<core.int> x1) Function<B extends core.int>(int x)
|
| x15;
|
| @@ -147,8 +122,8 @@ class U11<T> {
|
| void Function(int y, [List<Function> x]) Function<B extends core.int>(int x)
|
| x19;
|
| void Function(int x2, [List<T> x3]) Function<B extends core.int>(int x) x20;
|
| - List<Function> Function<A>(
|
| - core.List<core.int> x) Function<B extends core.int>(int x) x21;
|
| + List<Function> Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>(int x) x21;
|
| Function<A>(List<T> x) Function<B extends core.int>(int x) x22;
|
| void Function<A>() Function<B extends core.int>(int x) x23;
|
|
|
| @@ -379,8 +354,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m6 is int Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m6) is F6);
|
| // In checked mode, verifies the type.
|
| x6 = m6;
|
| @@ -430,8 +405,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(
|
| - {List<Function> x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m8 is Function Function({List<Function> x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -470,8 +445,8 @@ class U11<T> {
|
| Expect.isTrue(f10 is F10);
|
| Expect.isTrue(confuse(f10) is F10);
|
| // In checked mode, verifies the type.
|
| - List<Function> Function(int x1,
|
| - [List<Function> x]) Function<B extends core.int>(int x) l10;
|
| + List<Function> Function(int x1, [List<Function> x])
|
| + Function<B extends core.int>(int x) l10;
|
| // The static function f10 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x10 = f10 as dynamic;
|
| @@ -481,8 +456,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(int x1,
|
| - [List<Function> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m10 is List<Function> Function(int x1, [List<Function> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| @@ -507,8 +482,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is List<Function> Function(
|
| - [List<T> x1]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m11 is List<Function> Function([List<T> x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -523,7 +498,7 @@ class U11<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);
|
| });
|
| @@ -552,8 +527,8 @@ class U11<T> {
|
| Expect.isTrue(f12 is F12);
|
| Expect.isTrue(confuse(f12) is F12);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int x,
|
| - [Function x1]) Function<B extends core.int>(int x) l12;
|
| + core.List<core.int> Function(int x, [Function x1])
|
| + Function<B extends core.int>(int x) l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -563,8 +538,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x,
|
| - [Function x1]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int x, [Function x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -578,8 +553,8 @@ class U11<T> {
|
| Expect.isTrue(f13 is F13);
|
| Expect.isTrue(confuse(f13) is F13);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int y,
|
| - {core.List<core.int> x}) Function<B extends core.int>(int x) l13;
|
| + core.List<core.int> Function(int y, {core.List<core.int> x})
|
| + Function<B extends core.int>(int x) l13;
|
| // The static function f13 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x13 = f13 as dynamic;
|
| @@ -590,7 +565,8 @@ class U11<T> {
|
|
|
| Expect.isTrue(m13 is F13);
|
| Expect.isTrue(m13 is core.List<core.int> Function(int y,
|
| - {core.List<core.int> x}) Function<B extends core.int>(int x));
|
| + {core.List<core.int> x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -614,8 +590,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(
|
| - [Function x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m14 is List<T> Function([Function x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -630,7 +606,7 @@ class U11<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);
|
| });
|
| @@ -669,8 +645,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(
|
| - core.List<core.int> x1) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m15 is List<T> Function(core.List<core.int> x1)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -685,7 +661,7 @@ class U11<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);
|
| });
|
| @@ -750,8 +726,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m17 is F17);
|
| - Expect.isTrue(m17 is Function(int x1,
|
| - {List<Function> x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m17 is Function(int x1, {List<Function> x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m17) is F17);
|
| // In checked mode, verifies the type.
|
| x17 = m17;
|
| @@ -801,8 +777,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int y,
|
| - [List<Function> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m19 is void Function(int y, [List<Function> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| @@ -826,8 +802,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m20 is F20);
|
| - Expect.isTrue(m20 is void Function(int x2,
|
| - [List<T> x3]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m20 is void Function(int x2, [List<T> x3])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m20) is F20);
|
| // In checked mode, verifies the type.
|
| x20 = m20;
|
| @@ -842,7 +818,7 @@ class U11<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);
|
| });
|
| @@ -871,8 +847,8 @@ class U11<T> {
|
| Expect.isTrue(f21 is F21);
|
| Expect.isTrue(confuse(f21) is F21);
|
| // In checked mode, verifies the type.
|
| - List<Function> Function<A>(
|
| - core.List<core.int> x) Function<B extends core.int>(int x) l21;
|
| + List<Function> Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>(int x) l21;
|
| // The static function f21 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x21 = f21 as dynamic;
|
| @@ -882,8 +858,8 @@ class U11<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is List<Function> Function<A>(
|
| - core.List<core.int> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m21 is List<Function> 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;
|
| @@ -923,7 +899,7 @@ class U11<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);
|
| });
|
|
|