| Index: tests/language/function_type/function_type88_test.dart
|
| diff --git a/tests/language/function_type/function_type88_test.dart b/tests/language/function_type/function_type88_test.dart
|
| index ac9987286d516356d2debbdc6bea5af3ee54f2f1..0f38b68fe276b51f70ef5b81070db38bba8ddbfd 100644
|
| --- a/tests/language/function_type/function_type88_test.dart
|
| +++ b/tests/language/function_type/function_type88_test.dart
|
| @@ -19,10 +19,6 @@ import 'package:expect/expect.dart';
|
| @AssumeDynamic()
|
| confuse(f) => f;
|
|
|
| -final bool inCheckedMode =
|
| - (() { bool result = false; assert(result = true); return result; })();
|
| -
|
| -
|
| typedef F0<T> = Function Function(int y, {List<Function> x});
|
| typedef F1<T> = core.List<core.int> Function(int x0, {Function x});
|
| typedef F2<T> = Function({int x});
|
| @@ -35,7 +31,8 @@ typedef F8<T> = Function Function(int x1, [List<T> x2]) Function();
|
| typedef F9<T> = List<Function> Function({Function x}) Function();
|
| typedef F10<T> = List<Function> Function(List<T> x) Function();
|
| typedef F11<T> = core.List<core.int> Function(int x0, [Function x]) Function();
|
| -typedef F12<T> = core.List<core.int> Function([core.List<core.int> x1]) Function();
|
| +typedef F12<T> = core.List<core.int> Function([core.List<core.int> x1])
|
| + Function();
|
| typedef F13<T> = List<T> Function(int x, [int x2]) Function();
|
| typedef F14<T> = List<T> Function(int y, {List<Function> x}) Function();
|
| typedef F15<T> = Function([int x]) Function();
|
| @@ -47,7 +44,6 @@ typedef F20<T> = Function Function<A>(A x) Function();
|
| typedef F21<T> = List<T> Function<A>(List<A> x) Function();
|
| typedef F22<T> = void Function<A>(int x) Function();
|
|
|
| -
|
| Function f0(int y, {List<Function> x}) => null;
|
| core.List<core.int> f1(int x0, {Function x}) => null;
|
| f2({int x}) => null;
|
| @@ -72,7 +68,6 @@ Function Function<A>(A x) f20() => null;
|
| List<int> Function<A>(List<A> x) f21() => null;
|
| void Function<A>(int x) f22() => null;
|
|
|
| -
|
| class U88<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -102,7 +97,6 @@ class U88<T> {
|
| List<T> Function<A>(List<A> x) Function() x21;
|
| void Function<A>(int x) Function() x22;
|
|
|
| -
|
| U88({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -130,7 +124,6 @@ class U88<T> {
|
| List<T> Function<A>(List<A> x) m21() => null;
|
| void Function<A>(int x) m22() => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -179,7 +172,6 @@ class U88<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x0, {Function x})
|
| @@ -204,7 +196,6 @@ class U88<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// Function({int x})
|
| @@ -229,7 +220,6 @@ class U88<T> {
|
| l2 = m2;
|
| x2 = confuse(m2);
|
| l2 = confuse(m2);
|
| -
|
| }
|
|
|
| /// void Function({List<T> x})
|
| @@ -262,12 +252,20 @@ class U88<T> {
|
| Expect.equals(tIsDynamic, m3 is F3<bool>);
|
| Expect.equals(tIsDynamic, confuse(m3) is F3<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x3 = (f3 as dynamic); });
|
| - Expect.throws(() { x3 = confuse(f3); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x3 = (f3 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x3 = confuse(f3);
|
| + });
|
| void Function({List<T> x}) l3;
|
| - Expect.throws(() { l3 = (f3 as dynamic); });
|
| - Expect.throws(() { l3 = confuse(f3); });
|
| + Expect.throws(() {
|
| + l3 = (f3 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l3 = confuse(f3);
|
| + });
|
| }
|
| void Function({List<T> x}) l3 = m3;
|
| // In checked mode, verifies the type.
|
| @@ -298,7 +296,6 @@ class U88<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int x0, {List<Function> x}) Function()
|
| @@ -323,7 +320,6 @@ class U88<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// Function Function(int x) Function()
|
| @@ -348,7 +344,6 @@ class U88<T> {
|
| l6 = m6;
|
| x6 = confuse(m6);
|
| l6 = confuse(m6);
|
| -
|
| }
|
|
|
| /// Function Function(int y, [List<Function> x]) Function()
|
| @@ -366,14 +361,14 @@ class U88<T> {
|
| }
|
|
|
| Expect.isTrue(m7 is F7);
|
| - Expect.isTrue(m7 is Function Function(int y, [List<Function> x]) Function());
|
| + Expect
|
| + .isTrue(m7 is Function Function(int y, [List<Function> x]) Function());
|
| Expect.isTrue(confuse(m7) is F7);
|
| // In checked mode, verifies the type.
|
| x7 = m7;
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int x1, [List<T> x2]) Function()
|
| @@ -406,12 +401,20 @@ class U88<T> {
|
| Expect.equals(tIsDynamic, m8 is F8<bool>);
|
| Expect.equals(tIsDynamic, confuse(m8) is F8<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x8 = (f8 as dynamic); });
|
| - Expect.throws(() { x8 = confuse(f8); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x8 = (f8 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x8 = confuse(f8);
|
| + });
|
| Function Function(int x1, [List<T> x2]) Function() l8;
|
| - Expect.throws(() { l8 = (f8 as dynamic); });
|
| - Expect.throws(() { l8 = confuse(f8); });
|
| + Expect.throws(() {
|
| + l8 = (f8 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l8 = confuse(f8);
|
| + });
|
| }
|
| Function Function(int x1, [List<T> x2]) Function() l8 = m8;
|
| // In checked mode, verifies the type.
|
| @@ -442,7 +445,6 @@ class U88<T> {
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function(List<T> x) Function()
|
| @@ -475,12 +477,20 @@ class U88<T> {
|
| Expect.equals(tIsDynamic, m10 is F10<bool>);
|
| Expect.equals(tIsDynamic, confuse(m10) is F10<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x10 = (f10 as dynamic); });
|
| - Expect.throws(() { x10 = confuse(f10); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x10 = (f10 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x10 = confuse(f10);
|
| + });
|
| List<Function> Function(List<T> x) Function() l10;
|
| - Expect.throws(() { l10 = (f10 as dynamic); });
|
| - Expect.throws(() { l10 = confuse(f10); });
|
| + Expect.throws(() {
|
| + l10 = (f10 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l10 = confuse(f10);
|
| + });
|
| }
|
| List<Function> Function(List<T> x) Function() l10 = m10;
|
| // In checked mode, verifies the type.
|
| @@ -504,14 +514,14 @@ class U88<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(int x0, [Function x]) Function());
|
| + Expect.isTrue(
|
| + m11 is core.List<core.int> Function(int x0, [Function x]) Function());
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| l11 = m11;
|
| x11 = confuse(m11);
|
| l11 = confuse(m11);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function([core.List<core.int> x1]) Function()
|
| @@ -529,14 +539,14 @@ class U88<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function([core.List<core.int> x1]) Function());
|
| + Expect.isTrue(m12 is core.List<core.int> Function([core.List<core.int> x1])
|
| + Function());
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| l12 = m12;
|
| x12 = confuse(m12);
|
| l12 = confuse(m12);
|
| -
|
| }
|
|
|
| /// List<T> Function(int x, [int x2]) Function()
|
| @@ -569,12 +579,20 @@ class U88<T> {
|
| Expect.equals(tIsDynamic, m13 is F13<bool>);
|
| Expect.equals(tIsDynamic, confuse(m13) is F13<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x13 = (f13 as dynamic); });
|
| - Expect.throws(() { x13 = confuse(f13); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x13 = (f13 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x13 = confuse(f13);
|
| + });
|
| List<T> Function(int x, [int x2]) Function() l13;
|
| - Expect.throws(() { l13 = (f13 as dynamic); });
|
| - Expect.throws(() { l13 = confuse(f13); });
|
| + Expect.throws(() {
|
| + l13 = (f13 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l13 = confuse(f13);
|
| + });
|
| }
|
| List<T> Function(int x, [int x2]) Function() l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -598,7 +616,8 @@ class U88<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(int y, {List<Function> x}) Function());
|
| + Expect
|
| + .isTrue(m14 is List<T> Function(int y, {List<Function> x}) Function());
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -613,12 +632,20 @@ class U88<T> {
|
| Expect.equals(tIsDynamic, m14 is F14<bool>);
|
| Expect.equals(tIsDynamic, confuse(m14) is F14<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x14 = (f14 as dynamic); });
|
| - Expect.throws(() { x14 = confuse(f14); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x14 = (f14 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x14 = confuse(f14);
|
| + });
|
| List<T> Function(int y, {List<Function> x}) Function() l14;
|
| - Expect.throws(() { l14 = (f14 as dynamic); });
|
| - Expect.throws(() { l14 = confuse(f14); });
|
| + Expect.throws(() {
|
| + l14 = (f14 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l14 = confuse(f14);
|
| + });
|
| }
|
| List<T> Function(int y, {List<Function> x}) Function() l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -649,7 +676,6 @@ class U88<T> {
|
| l15 = m15;
|
| x15 = confuse(m15);
|
| l15 = confuse(m15);
|
| -
|
| }
|
|
|
| /// Function(List<Function> x0) Function()
|
| @@ -674,7 +700,6 @@ class U88<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(int x, [List<T> x2]) Function()
|
| @@ -707,12 +732,20 @@ class U88<T> {
|
| Expect.equals(tIsDynamic, m17 is F17<bool>);
|
| Expect.equals(tIsDynamic, confuse(m17) is F17<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x17 = (f17 as dynamic); });
|
| - Expect.throws(() { x17 = confuse(f17); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x17 = (f17 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x17 = confuse(f17);
|
| + });
|
| Function(int x, [List<T> x2]) Function() l17;
|
| - Expect.throws(() { l17 = (f17 as dynamic); });
|
| - Expect.throws(() { l17 = confuse(f17); });
|
| + Expect.throws(() {
|
| + l17 = (f17 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l17 = confuse(f17);
|
| + });
|
| }
|
| Function(int x, [List<T> x2]) Function() l17 = m17;
|
| // In checked mode, verifies the type.
|
| @@ -743,7 +776,6 @@ class U88<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function([List<T> x]) Function()
|
| @@ -776,12 +808,20 @@ class U88<T> {
|
| Expect.equals(tIsDynamic, m19 is F19<bool>);
|
| Expect.equals(tIsDynamic, confuse(m19) is F19<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x19 = (f19 as dynamic); });
|
| - Expect.throws(() { x19 = confuse(f19); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x19 = (f19 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x19 = confuse(f19);
|
| + });
|
| void Function([List<T> x]) Function() l19;
|
| - Expect.throws(() { l19 = (f19 as dynamic); });
|
| - Expect.throws(() { l19 = confuse(f19); });
|
| + Expect.throws(() {
|
| + l19 = (f19 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l19 = confuse(f19);
|
| + });
|
| }
|
| void Function([List<T> x]) Function() l19 = m19;
|
| // In checked mode, verifies the type.
|
| @@ -812,7 +852,6 @@ class U88<T> {
|
| l20 = m20;
|
| x20 = confuse(m20);
|
| l20 = confuse(m20);
|
| -
|
| }
|
|
|
| /// List<T> Function<A>(List<A> x) Function()
|
| @@ -845,12 +884,20 @@ class U88<T> {
|
| Expect.equals(tIsDynamic, m21 is F21<bool>);
|
| Expect.equals(tIsDynamic, confuse(m21) is F21<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x21 = (f21 as dynamic); });
|
| - Expect.throws(() { x21 = confuse(f21); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x21 = (f21 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x21 = confuse(f21);
|
| + });
|
| List<T> Function<A>(List<A> x) Function() l21;
|
| - Expect.throws(() { l21 = (f21 as dynamic); });
|
| - Expect.throws(() { l21 = confuse(f21); });
|
| + Expect.throws(() {
|
| + l21 = (f21 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l21 = confuse(f21);
|
| + });
|
| }
|
| List<T> Function<A>(List<A> x) Function() l21 = m21;
|
| // In checked mode, verifies the type.
|
| @@ -881,10 +928,7 @@ class U88<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -892,4 +936,3 @@ void main() {
|
| new U88<int>(tIsInt: true).runTests();
|
| new U88<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|