| Index: tests/language/function_type/function_type7_test.dart
|
| diff --git a/tests/language/function_type/function_type7_test.dart b/tests/language/function_type/function_type7_test.dart
|
| index 237146f40edf4dcce6c13bd4ad1b3eb11b3ed49c..b35afed2cb461351e21cadc9519b9721dcc25ca1 100644
|
| --- a/tests/language/function_type/function_type7_test.dart
|
| +++ b/tests/language/function_type/function_type7_test.dart
|
| @@ -19,68 +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>
|
| - = int Function(int x, [int x2]);
|
| -typedef F1<T>
|
| - = Function Function(int x, [List<T> x2]);
|
| -typedef F2<T>
|
| - = core.List<core.int> Function(int x1, [core.List<core.int> x2]);
|
| -typedef F3<T>
|
| - = Function([List<Function> x1]);
|
| -typedef F4<T>
|
| - = Function Function<A>(List<A> x);
|
| -typedef F5<T>
|
| - = int Function(int y, {int x}) Function<B extends core.int>(int x);
|
| -typedef F6<T>
|
| - = int Function(int x1,
|
| - [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(int x,
|
| - [List<Function> x1]) Function<B extends core.int>(int x);
|
| -typedef F9<T>
|
| - = Function Function(int y, {List<T> x}) Function<B extends core.int>(int x);
|
| -typedef F10<T>
|
| - = List<Function> Function([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 x2,
|
| - [Function x3]) Function<B extends core.int>(int x);
|
| -typedef F13<T>
|
| - = core.List<core.int> Function(int x1,
|
| - {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(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x);
|
| -typedef F16<T>
|
| - = Function([int x1]) Function<B extends core.int>(int x);
|
| -typedef F17<T>
|
| - = Function({List<Function> x}) Function<B extends core.int>(int x);
|
| -typedef F18<T>
|
| - = Function() Function<B extends core.int>(int x);
|
| -typedef F19<T>
|
| - = void Function(int x1, [List<Function> x]) Function<B extends core.int>(
|
| - int x);
|
| -typedef F20<T>
|
| - = void Function([List<T> x1]) Function<B extends core.int>(int x);
|
| -typedef F21<T>
|
| - = List<Function> Function<A>(List<Function> x) Function<B extends core.int>(
|
| - int x);
|
| -typedef F22<T>
|
| - = Function<A>(core.List<core.int> x) Function<B extends core.int>(int x);
|
| -typedef F23<T>
|
| - = void Function<A>(List<T> x) Function<B extends core.int>(int x);
|
| +typedef F0<T> = int Function(int x, [int x2]);
|
| +typedef F1<T> = Function Function(int x, [List<T> x2]);
|
| +typedef F2<T> = core.List<core.int> Function(int x1, [core.List<core.int> x2]);
|
| +typedef F3<T> = Function([List<Function> x1]);
|
| +typedef F4<T> = Function Function<A>(List<A> x);
|
| +typedef F5<T> = int Function(int y, {int x}) Function<B extends core.int>(
|
| + int x);
|
| +typedef F6<T> = int Function(int x1, [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(int x, [List<Function> x1])
|
| + Function<B extends core.int>(int x);
|
| +typedef F9<T> = Function Function(int y, {List<T> x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F10<T> = List<Function> Function([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 x2, [Function x3])
|
| + Function<B extends core.int>(int x);
|
| +typedef F13<T> = core.List<core.int> Function(int x1, {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(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F16<T> = Function([int x1]) Function<B extends core.int>(int x);
|
| +typedef F17<T> = Function({List<Function> x}) Function<B extends core.int>(
|
| + int x);
|
| +typedef F18<T> = Function() Function<B extends core.int>(int x);
|
| +typedef F19<T> = void Function(int x1, [List<Function> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F20<T> = void Function([List<T> x1]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F21<T> = List<Function> Function<A>(List<Function> x)
|
| + Function<B extends core.int>(int x);
|
| +typedef F22<T> = Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>(int x);
|
| +typedef F23<T> = void Function<A>(List<T> x) Function<B extends core.int>(
|
| + int x);
|
|
|
| int f0(int x, [int x0]) => null;
|
| Function f1(int x, [List<int> x0]) => null;
|
| @@ -137,10 +115,10 @@ class U7<T> {
|
| List<Function> Function([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 x2,
|
| - [Function x3]) Function<B extends core.int>(int x) x12;
|
| - core.List<core.int> Function(int x1,
|
| - {core.List<core.int> x}) Function<B extends core.int>(int x) x13;
|
| + core.List<core.int> Function(int x2, [Function x3])
|
| + Function<B extends core.int>(int x) x12;
|
| + core.List<core.int> Function(int x1, {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(int y, [core.List<core.int> x]) Function<B extends core.int>(
|
| int x) x15;
|
| @@ -274,7 +252,7 @@ class U7<T> {
|
| Expect.equals(tIsDynamic, m1 is F1<bool>);
|
| Expect.equals(tIsDynamic, confuse(m1) is F1<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x1 = (f1 as dynamic);
|
| });
|
| @@ -410,8 +388,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m6 is int Function(int x1, [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;
|
| @@ -461,8 +439,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int x,
|
| - [List<Function> x1]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m8 is Function Function(int x, [List<Function> x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -487,8 +465,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is Function Function(int y,
|
| - {List<T> x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m9 is Function Function(int y, {List<T> x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| @@ -503,7 +481,7 @@ class U7<T> {
|
| Expect.equals(tIsDynamic, m9 is F9<bool>);
|
| Expect.equals(tIsDynamic, confuse(m9) is F9<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x9 = (f9 as dynamic);
|
| });
|
| @@ -543,8 +521,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(
|
| - [List<Function> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m10 is List<Function> Function([List<Function> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| @@ -568,8 +546,8 @@ class U7<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;
|
| @@ -584,7 +562,7 @@ class U7<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);
|
| });
|
| @@ -613,8 +591,8 @@ class U7<T> {
|
| Expect.isTrue(f12 is F12);
|
| Expect.isTrue(confuse(f12) is F12);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int x2,
|
| - [Function x3]) Function<B extends core.int>(int x) l12;
|
| + core.List<core.int> Function(int x2, [Function x3])
|
| + Function<B extends core.int>(int x) l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -624,8 +602,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x2,
|
| - [Function x3]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int x2, [Function x3])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -639,8 +617,8 @@ class U7<T> {
|
| Expect.isTrue(f13 is F13);
|
| Expect.isTrue(confuse(f13) is F13);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int x1,
|
| - {core.List<core.int> x}) Function<B extends core.int>(int x) l13;
|
| + core.List<core.int> Function(int x1, {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;
|
| @@ -651,7 +629,8 @@ class U7<T> {
|
|
|
| Expect.isTrue(m13 is F13);
|
| Expect.isTrue(m13 is core.List<core.int> Function(int x1,
|
| - {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;
|
| @@ -675,8 +654,8 @@ class U7<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;
|
| @@ -691,7 +670,7 @@ class U7<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);
|
| });
|
| @@ -719,8 +698,8 @@ class U7<T> {
|
| Expect.isTrue(f15 is F15);
|
| Expect.isTrue(confuse(f15) is F15);
|
| // In checked mode, verifies the type.
|
| - List<T> Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x) l15;
|
| + List<T> Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x) l15;
|
| // The static function f15 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x15 = f15 as dynamic;
|
| @@ -730,8 +709,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m15 is List<T> Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -746,15 +725,15 @@ class U7<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 y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x) l15;
|
| + List<T> Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x) l15;
|
| Expect.throws(() {
|
| l15 = (f15 as dynamic);
|
| });
|
| @@ -762,9 +741,8 @@ class U7<T> {
|
| l15 = confuse(f15);
|
| });
|
| }
|
| - List<T> Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x) l15 =
|
| - m15;
|
| + List<T> Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x) l15 = m15;
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| x15 = confuse(m15);
|
| @@ -811,8 +789,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m17 is F17);
|
| - Expect.isTrue(m17 is Function(
|
| - {List<Function> x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m17 is Function({List<Function> x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m17) is F17);
|
| // In checked mode, verifies the type.
|
| x17 = m17;
|
| @@ -861,8 +839,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int x1,
|
| - [List<Function> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m19 is void Function(int x1, [List<Function> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| @@ -902,7 +880,7 @@ class U7<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);
|
| });
|
| @@ -940,8 +918,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is List<Function> Function<A>(
|
| - List<Function> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m21 is List<Function> Function<A>(List<Function> x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
| @@ -965,8 +943,8 @@ class U7<T> {
|
| }
|
|
|
| Expect.isTrue(m22 is F22);
|
| - Expect.isTrue(m22 is Function<A>(
|
| - core.List<core.int> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m22 is Function<A>(core.List<core.int> x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m22) is F22);
|
| // In checked mode, verifies the type.
|
| x22 = m22;
|
| @@ -1006,7 +984,7 @@ class U7<T> {
|
| Expect.equals(tIsDynamic, m23 is F23<bool>);
|
| Expect.equals(tIsDynamic, confuse(m23) is F23<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x23 = (f23 as dynamic);
|
| });
|
|
|