| Index: tests/language/function_type/function_type21_test.dart
|
| diff --git a/tests/language/function_type/function_type21_test.dart b/tests/language/function_type/function_type21_test.dart
|
| index 5415c494c9fee072a5b42d157971b12a4d948717..3d387837d5359056836245d1cd4d7b49cc6c3ff1 100644
|
| --- a/tests/language/function_type/function_type21_test.dart
|
| +++ b/tests/language/function_type/function_type21_test.dart
|
| @@ -19,60 +19,33 @@ 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 y, {Function x});
|
| -typedef F1<T>
|
| - = List<Function> Function(int x0, {int x});
|
| -typedef F2<T>
|
| - = core.List<core.int> Function(int x0, {List<T> x});
|
| -typedef F3<T>
|
| - = Function({core.List<core.int> x});
|
| -typedef F4<T>
|
| - = core.List<core.int> Function<A>();
|
| -typedef F5<T>
|
| - = int Function(int y, [Function x]) Function(int x);
|
| -typedef F6<T>
|
| - = int Function(int x2, [core.List<core.int> x3]) Function(int x);
|
| -typedef F7<T>
|
| - = Function Function({int x}) Function(int x);
|
| -typedef F8<T>
|
| - = Function Function(core.List<core.int> x) Function(int x);
|
| -typedef F9<T>
|
| - = List<Function> Function(int x1, [int x]) Function(int x);
|
| -typedef F10<T>
|
| - = List<Function> Function([List<Function> x1]) Function(int x);
|
| -typedef F11<T>
|
| - = List<Function> Function({List<T> x}) Function(int x);
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(int y, {Function x}) Function(int x);
|
| -typedef F13<T>
|
| - = core.List<core.int> Function(int x1, [List<T> x]) Function(int x);
|
| -typedef F14<T>
|
| - = List<T> Function(Function x1) Function(int x);
|
| -typedef F15<T>
|
| - = List<T> Function(int x, [core.List<core.int> x1]) Function(int x);
|
| -typedef F16<T>
|
| - = Function(int x1, {int x}) Function(int x);
|
| -typedef F17<T>
|
| - = Function([core.List<core.int> x]) Function(int x);
|
| -typedef F18<T>
|
| - = void Function(int y, [int x]) Function(int x);
|
| -typedef F19<T>
|
| - = void Function(int x2, [List<Function> x3]) Function(int x);
|
| -typedef F20<T>
|
| - = void Function(int x1, {List<T> x}) Function(int x);
|
| -typedef F21<T>
|
| - = List<Function> Function<A>(A x) Function(int x);
|
| -typedef F22<T>
|
| - = Function<A>(List<A> x) Function(int x);
|
| -typedef F23<T>
|
| - = int Function(B x) Function<B extends core.int>(int x);
|
| +typedef F0<T> = int Function(int y, {Function x});
|
| +typedef F1<T> = List<Function> Function(int x0, {int x});
|
| +typedef F2<T> = core.List<core.int> Function(int x0, {List<T> x});
|
| +typedef F3<T> = Function({core.List<core.int> x});
|
| +typedef F4<T> = core.List<core.int> Function<A>();
|
| +typedef F5<T> = int Function(int y, [Function x]) Function(int x);
|
| +typedef F6<T> = int Function(int x2, [core.List<core.int> x3]) Function(int x);
|
| +typedef F7<T> = Function Function({int x}) Function(int x);
|
| +typedef F8<T> = Function Function(core.List<core.int> x) Function(int x);
|
| +typedef F9<T> = List<Function> Function(int x1, [int x]) Function(int x);
|
| +typedef F10<T> = List<Function> Function([List<Function> x1]) Function(int x);
|
| +typedef F11<T> = List<Function> Function({List<T> x}) Function(int x);
|
| +typedef F12<T> = core.List<core.int> Function(int y, {Function x}) Function(
|
| + int x);
|
| +typedef F13<T> = core.List<core.int> Function(int x1, [List<T> x]) Function(
|
| + int x);
|
| +typedef F14<T> = List<T> Function(Function x1) Function(int x);
|
| +typedef F15<T> = List<T> Function(int x, [core.List<core.int> x1]) Function(
|
| + int x);
|
| +typedef F16<T> = Function(int x1, {int x}) Function(int x);
|
| +typedef F17<T> = Function([core.List<core.int> x]) Function(int x);
|
| +typedef F18<T> = void Function(int y, [int x]) Function(int x);
|
| +typedef F19<T> = void Function(int x2, [List<Function> x3]) Function(int x);
|
| +typedef F20<T> = void Function(int x1, {List<T> x}) Function(int x);
|
| +typedef F21<T> = List<Function> Function<A>(A x) Function(int x);
|
| +typedef F22<T> = Function<A>(List<A> x) Function(int x);
|
| +typedef F23<T> = int Function(B x) Function<B extends core.int>(int x);
|
|
|
| int f0(int y, {Function x}) => null;
|
| List<Function> f1(int x0, {int x}) => null;
|
| @@ -262,7 +235,7 @@ class U21<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);
|
| });
|
| @@ -510,7 +483,7 @@ class U21<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);
|
| });
|
| @@ -547,8 +520,8 @@ class U21<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int y,
|
| - {Function x}) Function(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int y, {Function x})
|
| + Function(int x));
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -572,8 +545,8 @@ class U21<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(int x1,
|
| - [List<T> x]) Function(int x));
|
| + Expect.isTrue(m13 is core.List<core.int> Function(int x1, [List<T> x])
|
| + Function(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -588,7 +561,7 @@ class U21<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);
|
| });
|
| @@ -641,7 +614,7 @@ class U21<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);
|
| });
|
| @@ -678,8 +651,8 @@ class U21<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int x,
|
| - [core.List<core.int> x1]) Function(int x));
|
| + Expect.isTrue(m15 is List<T> Function(int x, [core.List<core.int> x1])
|
| + Function(int x));
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -694,7 +667,7 @@ class U21<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);
|
| });
|
| @@ -844,7 +817,7 @@ class U21<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);
|
| });
|
|
|