| Index: tests/language/function_type/function_type35_test.dart
|
| diff --git a/tests/language/function_type/function_type35_test.dart b/tests/language/function_type/function_type35_test.dart
|
| index 185f1fee0885ed780fda7bbacbf78fb026f74b7e..3afa7cc0a06d7d85aeb20a838babb8b096698c05 100644
|
| --- a/tests/language/function_type/function_type35_test.dart
|
| +++ b/tests/language/function_type/function_type35_test.dart
|
| @@ -19,69 +19,45 @@ 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 x0, [core.List<core.int> x]);
|
| -typedef F1<T>
|
| - = List<Function> Function([List<Function> x]);
|
| -typedef F2<T>
|
| - = List<T> Function(Function x);
|
| -typedef F3<T>
|
| - = Function();
|
| -typedef F4<T>
|
| - = Function<A>(core.List<core.int> x);
|
| -typedef F5<T>
|
| - = int Function(int x2, [Function x3]) 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(Function x) Function<B extends core.int>(int x);
|
| -typedef F8<T>
|
| - = Function Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x);
|
| -typedef F9<T>
|
| - = List<Function> Function([int x1]) 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() Function<B extends core.int>(int x);
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(int x1,
|
| - [List<Function> x]) Function<B extends core.int>(int x);
|
| -typedef F13<T>
|
| - = core.List<core.int> Function([List<T> x1]) Function<B extends core.int>(
|
| - int x);
|
| -typedef F14<T>
|
| - = List<T> Function(int x, [Function x1]) 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([Function x]) Function<B extends core.int>(int x);
|
| -typedef F17<T>
|
| - = Function(core.List<core.int> x1) Function<B extends core.int>(int x);
|
| -typedef F18<T>
|
| - = void Function(int x2, [int x3]) 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>
|
| - = int Function<A>(int x) Function<B extends core.int>(int x);
|
| -typedef F21<T>
|
| - = core.List<core.int> Function<A>(Function x) Function<B extends core.int>(
|
| - int x);
|
| -typedef F22<T>
|
| - = A Function<A>(List<Function> x) Function<B extends core.int>(int x);
|
| -typedef F23<T>
|
| - = List<B> Function(B x) Function<B extends core.int>(int x);
|
| +typedef F0<T> = int Function(int x0, [core.List<core.int> x]);
|
| +typedef F1<T> = List<Function> Function([List<Function> x]);
|
| +typedef F2<T> = List<T> Function(Function x);
|
| +typedef F3<T> = Function();
|
| +typedef F4<T> = Function<A>(core.List<core.int> x);
|
| +typedef F5<T> = int Function(int x2, [Function x3])
|
| + 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(Function x) Function<B extends core.int>(
|
| + int x);
|
| +typedef F8<T> = Function Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F9<T> = List<Function> Function([int x1]) 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() Function<B extends core.int>(int x);
|
| +typedef F12<T> = core.List<core.int> Function(int x1, [List<Function> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F13<T> = core.List<core.int> Function([List<T> x1])
|
| + Function<B extends core.int>(int x);
|
| +typedef F14<T> = List<T> Function(int x, [Function x1])
|
| + 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([Function x]) Function<B extends core.int>(int x);
|
| +typedef F17<T> = Function(core.List<core.int> x1) Function<B extends core.int>(
|
| + int x);
|
| +typedef F18<T> = void Function(int x2, [int x3]) 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> = int Function<A>(int x) Function<B extends core.int>(int x);
|
| +typedef F21<T> = core.List<core.int> Function<A>(Function x)
|
| + Function<B extends core.int>(int x);
|
| +typedef F22<T> = A Function<A>(List<Function> x) Function<B extends core.int>(
|
| + int x);
|
| +typedef F23<T> = List<B> Function(B x) Function<B extends core.int>(int x);
|
|
|
| int f0(int x0, [core.List<core.int> x]) => null;
|
| List<Function> f1([List<Function> x]) => null;
|
| @@ -132,14 +108,14 @@ class U35<T> {
|
| int Function(int x1, {core.List<core.int> x}) Function<B extends core.int>(
|
| int x) x6;
|
| Function Function(Function x) Function<B extends core.int>(int x) x7;
|
| - Function Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x) x8;
|
| + Function Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x) x8;
|
| List<Function> Function([int x1]) Function<B extends core.int>(int x) x9;
|
| List<Function> Function({List<Function> x}) Function<B extends core.int>(
|
| int x) x10;
|
| List<Function> Function() Function<B extends core.int>(int x) x11;
|
| - core.List<core.int> Function(int x1,
|
| - [List<Function> x]) Function<B extends core.int>(int x) x12;
|
| + core.List<core.int> Function(int x1, [List<Function> x])
|
| + Function<B extends core.int>(int x) x12;
|
| core.List<core.int> Function([List<T> x1]) Function<B extends core.int>(int x)
|
| x13;
|
| List<T> Function(int x, [Function x1]) Function<B extends core.int>(int x)
|
| @@ -300,7 +276,7 @@ class U35<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);
|
| });
|
| @@ -385,8 +361,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m5 is F5);
|
| - Expect.isTrue(m5 is int Function(int x2,
|
| - [Function x3]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m5 is int Function(int x2, [Function x3])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m5) is F5);
|
| // In checked mode, verifies the type.
|
| x5 = m5;
|
| @@ -411,8 +387,8 @@ class U35<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;
|
| @@ -436,8 +412,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m7 is F7);
|
| - Expect.isTrue(m7 is Function Function(
|
| - Function x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m7 is Function Function(Function x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m7) is F7);
|
| // In checked mode, verifies the type.
|
| x7 = m7;
|
| @@ -451,8 +427,8 @@ class U35<T> {
|
| Expect.isTrue(f8 is F8);
|
| Expect.isTrue(confuse(f8) is F8);
|
| // In checked mode, verifies the type.
|
| - Function Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x) l8;
|
| + Function Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x) l8;
|
| // The static function f8 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x8 = f8 as dynamic;
|
| @@ -462,8 +438,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m8 is Function Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -487,8 +463,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(
|
| - [int x1]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m9 is List<Function> Function([int x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| @@ -513,8 +489,8 @@ class U35<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;
|
| @@ -553,8 +529,8 @@ class U35<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,
|
| - [List<Function> x]) Function<B extends core.int>(int x) l12;
|
| + core.List<core.int> Function(int x1, [List<Function> x])
|
| + Function<B extends core.int>(int x) l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -565,7 +541,8 @@ class U35<T> {
|
|
|
| Expect.isTrue(m12 is F12);
|
| Expect.isTrue(m12 is core.List<core.int> Function(int x1,
|
| - [List<Function> x]) Function<B extends core.int>(int x));
|
| + [List<Function> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -590,8 +567,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(
|
| - [List<T> x1]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m13 is core.List<core.int> Function([List<T> x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -606,7 +583,7 @@ class U35<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);
|
| });
|
| @@ -646,8 +623,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(int x,
|
| - [Function x1]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m14 is List<T> Function(int x, [Function x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -662,7 +639,7 @@ class U35<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);
|
| });
|
| @@ -691,8 +668,8 @@ class U35<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;
|
| @@ -702,8 +679,8 @@ class U35<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;
|
| @@ -718,15 +695,15 @@ class U35<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);
|
| });
|
| @@ -734,9 +711,8 @@ class U35<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);
|
| @@ -783,8 +759,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m17 is F17);
|
| - Expect.isTrue(m17 is Function(
|
| - core.List<core.int> x1) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m17 is Function(core.List<core.int> x1)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m17) is F17);
|
| // In checked mode, verifies the type.
|
| x17 = m17;
|
| @@ -808,8 +784,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m18 is F18);
|
| - Expect.isTrue(m18 is void Function(int x2,
|
| - [int x3]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m18 is void Function(int x2, [int x3])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m18) is F18);
|
| // In checked mode, verifies the type.
|
| x18 = m18;
|
| @@ -834,8 +810,8 @@ class U35<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;
|
| @@ -885,8 +861,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is core.List<core.int> Function<A>(
|
| - Function x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m21 is core.List<core.int> Function<A>(Function x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
| @@ -910,8 +886,8 @@ class U35<T> {
|
| }
|
|
|
| Expect.isTrue(m22 is F22);
|
| - Expect.isTrue(m22 is A Function<A>(
|
| - List<Function> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m22 is A Function<A>(List<Function> x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m22) is F22);
|
| // In checked mode, verifies the type.
|
| x22 = m22;
|
|
|