| Index: tests/language/function_type/function_type55_test.dart
|
| diff --git a/tests/language/function_type/function_type55_test.dart b/tests/language/function_type/function_type55_test.dart
|
| index 58106ba2be3d4acf6cd43e1b883e0f2c0a3a7132..803181d19973f1e6d1d6657920fd2e30eb5450de 100644
|
| --- a/tests/language/function_type/function_type55_test.dart
|
| +++ b/tests/language/function_type/function_type55_test.dart
|
| @@ -19,65 +19,44 @@ 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();
|
| -typedef F1<T>
|
| - = List<Function> Function(int y, {core.List<core.int> x});
|
| -typedef F2<T>
|
| - = List<T> Function(int x0, {List<Function> x});
|
| -typedef F3<T>
|
| - = void Function({Function x});
|
| -typedef F4<T>
|
| - = List<A> Function<A>(List<A> x);
|
| -typedef F5<T>
|
| - = int Function(List<Function> x) Function<B extends core.int>(int x);
|
| -typedef F6<T>
|
| - = int Function(int y, [List<T> x]) Function<B extends core.int>(int x);
|
| -typedef F7<T>
|
| - = Function Function([Function x1]) Function<B extends core.int>(int x);
|
| -typedef F8<T>
|
| - = Function Function({core.List<core.int> x}) Function<B extends core.int>(
|
| - int x);
|
| -typedef F9<T>
|
| - = List<Function> Function(int y, {int x}) Function<B extends core.int>(
|
| - int x);
|
| -typedef F10<T>
|
| - = List<Function> Function(int x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x);
|
| -typedef F11<T>
|
| - = core.List<core.int> Function(int x1) Function<B extends core.int>(int x);
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(int x,
|
| - [List<Function> x1]) Function<B extends core.int>(int x);
|
| -typedef F13<T>
|
| - = core.List<core.int> Function(int y,
|
| - {List<T> x}) Function<B extends core.int>(int x);
|
| -typedef F14<T>
|
| - = List<T> Function([List<Function> x]) Function<B extends core.int>(int x);
|
| -typedef F15<T>
|
| - = List<T> Function(List<T> x1) Function<B extends core.int>(int x);
|
| -typedef F16<T>
|
| - = Function(int x2, [Function x3]) Function<B extends core.int>(int x);
|
| -typedef F17<T>
|
| - = Function(int x1, {core.List<core.int> x}) Function<B extends core.int>(
|
| - int x);
|
| -typedef F18<T>
|
| - = void Function(Function x) Function<B extends core.int>(int x);
|
| -typedef F19<T>
|
| - = void Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x);
|
| -typedef F20<T>
|
| - = int Function<A>() Function<B extends core.int>(int x);
|
| -typedef F21<T>
|
| - = core.List<core.int> Function<A>(A x) Function<B extends core.int>(int x);
|
| -typedef F22<T>
|
| - = A Function<A>(List<A> x) Function<B extends core.int>(int x);
|
| +typedef F0<T> = int Function();
|
| +typedef F1<T> = List<Function> Function(int y, {core.List<core.int> x});
|
| +typedef F2<T> = List<T> Function(int x0, {List<Function> x});
|
| +typedef F3<T> = void Function({Function x});
|
| +typedef F4<T> = List<A> Function<A>(List<A> x);
|
| +typedef F5<T> = int Function(List<Function> x) Function<B extends core.int>(
|
| + int x);
|
| +typedef F6<T> = int Function(int y, [List<T> x]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F7<T> = Function Function([Function x1]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F8<T> = Function Function({core.List<core.int> x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F9<T> = List<Function> Function(int y, {int x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F10<T> = List<Function> Function(int x1, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F11<T> = core.List<core.int> Function(int x1)
|
| + Function<B extends core.int>(int x);
|
| +typedef F12<T> = core.List<core.int> Function(int x, [List<Function> x1])
|
| + Function<B extends core.int>(int x);
|
| +typedef F13<T> = core.List<core.int> Function(int y, {List<T> x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F14<T> = List<T> Function([List<Function> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F15<T> = List<T> Function(List<T> x1) Function<B extends core.int>(
|
| + int x);
|
| +typedef F16<T> = Function(int x2, [Function x3]) Function<B extends core.int>(
|
| + int x);
|
| +typedef F17<T> = Function(int x1, {core.List<core.int> x})
|
| + Function<B extends core.int>(int x);
|
| +typedef F18<T> = void Function(Function x) Function<B extends core.int>(int x);
|
| +typedef F19<T> = void Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x);
|
| +typedef F20<T> = int Function<A>() Function<B extends core.int>(int x);
|
| +typedef F21<T> = core.List<core.int> Function<A>(A x)
|
| + Function<B extends core.int>(int x);
|
| +typedef F22<T> = A Function<A>(List<A> x) Function<B extends core.int>(int x);
|
|
|
| int f0() => null;
|
| List<Function> f1(int y, {core.List<core.int> x}) => null;
|
| @@ -127,11 +106,11 @@ class U55<T> {
|
| x8;
|
| List<Function> Function(int y, {int x}) Function<B extends core.int>(int x)
|
| x9;
|
| - List<Function> Function(int x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x) x10;
|
| + List<Function> Function(int x1, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x) x10;
|
| core.List<core.int> Function(int x1) Function<B extends core.int>(int x) x11;
|
| - core.List<core.int> Function(int x,
|
| - [List<Function> x1]) Function<B extends core.int>(int x) x12;
|
| + core.List<core.int> Function(int x, [List<Function> x1])
|
| + Function<B extends core.int>(int x) x12;
|
| core.List<core.int> Function(int y, {List<T> x}) Function<B extends core.int>(
|
| int x) x13;
|
| List<T> Function([List<Function> x]) Function<B extends core.int>(int x) x14;
|
| @@ -286,7 +265,7 @@ class U55<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);
|
| });
|
| @@ -371,8 +350,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m5 is F5);
|
| - Expect.isTrue(m5 is int Function(
|
| - List<Function> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m5 is int Function(List<Function> x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m5) is F5);
|
| // In checked mode, verifies the type.
|
| x5 = m5;
|
| @@ -396,8 +375,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int y,
|
| - [List<T> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m6 is int Function(int y, [List<T> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m6) is F6);
|
| // In checked mode, verifies the type.
|
| x6 = m6;
|
| @@ -412,7 +391,7 @@ class U55<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);
|
| });
|
| @@ -450,8 +429,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m7 is F7);
|
| - Expect.isTrue(m7 is Function Function(
|
| - [Function x1]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m7 is Function Function([Function x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m7) is F7);
|
| // In checked mode, verifies the type.
|
| x7 = m7;
|
| @@ -476,8 +455,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(
|
| - {core.List<core.int> x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m8 is Function Function({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;
|
| @@ -502,8 +481,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(int y,
|
| - {int x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m9 is List<Function> Function(int y, {int x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| @@ -517,8 +496,8 @@ class U55<T> {
|
| Expect.isTrue(f10 is F10);
|
| Expect.isTrue(confuse(f10) is F10);
|
| // In checked mode, verifies the type.
|
| - List<Function> Function(int x1,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x) l10;
|
| + List<Function> Function(int x1, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x) l10;
|
| // The static function f10 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x10 = f10 as dynamic;
|
| @@ -529,7 +508,8 @@ class U55<T> {
|
|
|
| Expect.isTrue(m10 is F10);
|
| Expect.isTrue(m10 is List<Function> 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(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| @@ -554,8 +534,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(
|
| - int x1) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m11 is core.List<core.int> Function(int x1)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -569,8 +549,8 @@ class U55<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,
|
| - [List<Function> x1]) Function<B extends core.int>(int x) l12;
|
| + core.List<core.int> Function(int x, [List<Function> x1])
|
| + Function<B extends core.int>(int x) l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -581,7 +561,8 @@ class U55<T> {
|
|
|
| Expect.isTrue(m12 is F12);
|
| Expect.isTrue(m12 is core.List<core.int> Function(int x,
|
| - [List<Function> x1]) Function<B extends core.int>(int x));
|
| + [List<Function> x1])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -595,8 +576,8 @@ class U55<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,
|
| - {List<T> x}) Function<B extends core.int>(int x) l13;
|
| + core.List<core.int> Function(int y, {List<T> x})
|
| + Function<B extends core.int>(int x) l13;
|
| // The static function f13 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x13 = f13 as dynamic;
|
| @@ -606,8 +587,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(int y,
|
| - {List<T> x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m13 is core.List<core.int> Function(int y, {List<T> x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -622,15 +603,15 @@ class U55<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);
|
| });
|
| Expect.throws(() {
|
| x13 = confuse(f13);
|
| });
|
| - core.List<core.int> Function(int y,
|
| - {List<T> x}) Function<B extends core.int>(int x) l13;
|
| + core.List<core.int> Function(int y, {List<T> x})
|
| + Function<B extends core.int>(int x) l13;
|
| Expect.throws(() {
|
| l13 = (f13 as dynamic);
|
| });
|
| @@ -638,8 +619,8 @@ class U55<T> {
|
| l13 = confuse(f13);
|
| });
|
| }
|
| - core.List<core.int> Function(int y,
|
| - {List<T> x}) Function<B extends core.int>(int x) l13 = m13;
|
| + core.List<core.int> Function(int y, {List<T> x})
|
| + Function<B extends core.int>(int x) l13 = m13;
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| x13 = confuse(m13);
|
| @@ -662,8 +643,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(
|
| - [List<Function> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m14 is List<T> Function([List<Function> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -678,7 +659,7 @@ class U55<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);
|
| });
|
| @@ -717,8 +698,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(
|
| - List<T> x1) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m15 is List<T> Function(List<T> x1)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -733,7 +714,7 @@ class U55<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);
|
| });
|
| @@ -771,8 +752,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m16 is F16);
|
| - Expect.isTrue(m16 is Function(int x2,
|
| - [Function x3]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m16 is Function(int x2, [Function x3])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m16) is F16);
|
| // In checked mode, verifies the type.
|
| x16 = m16;
|
| @@ -797,8 +778,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m17 is F17);
|
| - Expect.isTrue(m17 is Function(int x1,
|
| - {core.List<core.int> x}) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m17 is Function(int x1, {core.List<core.int> x})
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m17) is F17);
|
| // In checked mode, verifies the type.
|
| x17 = m17;
|
| @@ -848,8 +829,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int y,
|
| - [core.List<core.int> x]) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m19 is void Function(int y, [core.List<core.int> x])
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| @@ -898,8 +879,8 @@ class U55<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is core.List<core.int> Function<A>(
|
| - A x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m21 is core.List<core.int> Function<A>(A x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
|
|