| Index: tests/language/function_type/function_type45_test.dart
|
| diff --git a/tests/language/function_type/function_type45_test.dart b/tests/language/function_type/function_type45_test.dart
|
| index b0f1b0727faf5b06836fbb6dcb93887806871798..0f3d8205f1c94d3c9b55b8cf6392859a9b25f5eb 100644
|
| --- a/tests/language/function_type/function_type45_test.dart
|
| +++ b/tests/language/function_type/function_type45_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([List<T> x]);
|
| -typedef F1<T>
|
| - = List<Function> Function(core.List<core.int> x);
|
| -typedef F2<T>
|
| - = List<T> Function(int y, {Function x});
|
| -typedef F3<T>
|
| - = void Function(int x0, {int x});
|
| -typedef F4<T>
|
| - = A Function<A>();
|
| -typedef F5<T>
|
| - = int Function(int x1, {Function x}) Function(int x);
|
| -typedef F6<T>
|
| - = int Function([List<T> x]) Function(int x);
|
| -typedef F7<T>
|
| - = Function Function(int y, [Function x]) Function(int x);
|
| -typedef F8<T>
|
| - = Function Function(int x2, [core.List<core.int> x3]) Function(int x);
|
| -typedef F9<T>
|
| - = List<Function> Function({int x}) Function(int x);
|
| -typedef F10<T>
|
| - = List<Function> Function(core.List<core.int> x) Function(int x);
|
| -typedef F11<T>
|
| - = core.List<core.int> Function(int x1, [int x]) Function(int x);
|
| -typedef F12<T>
|
| - = core.List<core.int> Function([List<Function> x1]) Function(int x);
|
| -typedef F13<T>
|
| - = core.List<core.int> Function({List<T> x}) Function(int x);
|
| -typedef F14<T>
|
| - = List<T> Function(int y, {Function x}) Function(int x);
|
| -typedef F15<T>
|
| - = List<T> Function(int x1, [List<T> x]) Function(int x);
|
| -typedef F16<T>
|
| - = Function(Function x1) Function(int x);
|
| -typedef F17<T>
|
| - = Function(int x, [core.List<core.int> x1]) Function(int x);
|
| -typedef F18<T>
|
| - = void Function(int x1, {int x}) Function(int x);
|
| -typedef F19<T>
|
| - = void Function([core.List<core.int> x]) Function(int x);
|
| -typedef F20<T>
|
| - = int Function<A>(core.List<core.int> x) Function(int x);
|
| -typedef F21<T>
|
| - = core.List<core.int> Function<A>(List<T> x) Function(int x);
|
| -typedef F22<T>
|
| - = A Function<A>() Function(int x);
|
| -typedef F23<T>
|
| - = B Function(core.List<core.int> x) Function<B extends core.int>(int x);
|
| +typedef F0<T> = int Function([List<T> x]);
|
| +typedef F1<T> = List<Function> Function(core.List<core.int> x);
|
| +typedef F2<T> = List<T> Function(int y, {Function x});
|
| +typedef F3<T> = void Function(int x0, {int x});
|
| +typedef F4<T> = A Function<A>();
|
| +typedef F5<T> = int Function(int x1, {Function x}) Function(int x);
|
| +typedef F6<T> = int Function([List<T> x]) Function(int x);
|
| +typedef F7<T> = Function Function(int y, [Function x]) Function(int x);
|
| +typedef F8<T> = Function Function(int x2, [core.List<core.int> x3]) Function(
|
| + int x);
|
| +typedef F9<T> = List<Function> Function({int x}) Function(int x);
|
| +typedef F10<T> = List<Function> Function(core.List<core.int> x) Function(int x);
|
| +typedef F11<T> = core.List<core.int> Function(int x1, [int x]) Function(int x);
|
| +typedef F12<T> = core.List<core.int> Function([List<Function> x1]) Function(
|
| + int x);
|
| +typedef F13<T> = core.List<core.int> Function({List<T> x}) Function(int x);
|
| +typedef F14<T> = List<T> Function(int y, {Function x}) Function(int x);
|
| +typedef F15<T> = List<T> Function(int x1, [List<T> x]) Function(int x);
|
| +typedef F16<T> = Function(Function x1) Function(int x);
|
| +typedef F17<T> = Function(int x, [core.List<core.int> x1]) Function(int x);
|
| +typedef F18<T> = void Function(int x1, {int x}) Function(int x);
|
| +typedef F19<T> = void Function([core.List<core.int> x]) Function(int x);
|
| +typedef F20<T> = int Function<A>(core.List<core.int> x) Function(int x);
|
| +typedef F21<T> = core.List<core.int> Function<A>(List<T> x) Function(int x);
|
| +typedef F22<T> = A Function<A>() Function(int x);
|
| +typedef F23<T> = B Function(core.List<core.int> x) Function<B extends core.int>(
|
| + int x);
|
|
|
| int f0([List<int> x]) => null;
|
| List<Function> f1(core.List<core.int> x) => null;
|
| @@ -214,7 +187,7 @@ class U45<T> {
|
| Expect.equals(tIsDynamic, m0 is F0<bool>);
|
| Expect.equals(tIsDynamic, confuse(m0) is F0<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x0 = (f0 as dynamic);
|
| });
|
| @@ -290,7 +263,7 @@ class U45<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);
|
| });
|
| @@ -414,7 +387,7 @@ class U45<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);
|
| });
|
| @@ -475,8 +448,8 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int x2,
|
| - [core.List<core.int> x3]) Function(int x));
|
| + Expect.isTrue(m8 is Function Function(int x2, [core.List<core.int> x3])
|
| + Function(int x));
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| @@ -574,8 +547,8 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(
|
| - [List<Function> x1]) Function(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function([List<Function> x1])
|
| + Function(int x));
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -615,7 +588,7 @@ class U45<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);
|
| });
|
| @@ -667,7 +640,7 @@ class U45<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,7 +692,7 @@ class U45<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);
|
| });
|
| @@ -895,7 +868,7 @@ class U45<T> {
|
| Expect.equals(tIsDynamic, m21 is F21<bool>);
|
| Expect.equals(tIsDynamic, confuse(m21) is F21<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x21 = (f21 as dynamic);
|
| });
|
| @@ -956,8 +929,8 @@ class U45<T> {
|
| }
|
|
|
| Expect.isTrue(m23 is F23);
|
| - Expect.isTrue(m23 is B Function(
|
| - core.List<core.int> x) Function<B extends core.int>(int x));
|
| + Expect.isTrue(m23 is B Function(core.List<core.int> x)
|
| + Function<B extends core.int>(int x));
|
| Expect.isTrue(confuse(m23) is F23);
|
| // In checked mode, verifies the type.
|
| x23 = m23;
|
|
|