| Index: tests/language/function_type/function_type68_test.dart
|
| diff --git a/tests/language/function_type/function_type68_test.dart b/tests/language/function_type/function_type68_test.dart
|
| index 986a0a462385c180426bc2ffb7f214ce7d5324b1..b1d155b267f7fa4bc21a0a920018b45dd2a46d87 100644
|
| --- a/tests/language/function_type/function_type68_test.dart
|
| +++ b/tests/language/function_type/function_type68_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([Function x]);
|
| typedef F1<T> = core.List<core.int> Function(int x);
|
| typedef F2<T> = List<T> Function(List<T> x);
|
| @@ -33,7 +29,8 @@ typedef F6<T> = int Function(int x, [List<T> x2]) Function();
|
| typedef F7<T> = Function Function(int x0, {Function x}) Function();
|
| typedef F8<T> = Function Function([List<T> x]) Function();
|
| typedef F9<T> = List<Function> Function(int y, [Function x]) Function();
|
| -typedef F10<T> = List<Function> Function(int x1, [core.List<core.int> x2]) Function();
|
| +typedef F10<T> = List<Function> Function(int x1, [core.List<core.int> x2])
|
| + Function();
|
| typedef F11<T> = core.List<core.int> Function({int x}) Function();
|
| typedef F12<T> = core.List<core.int> Function(core.List<core.int> x) Function();
|
| typedef F13<T> = List<T> Function(int x0, [int x]) Function();
|
| @@ -47,7 +44,6 @@ typedef F20<T> = Function Function<A>(Function x) Function();
|
| typedef F21<T> = List<T> Function<A>(List<Function> x) Function();
|
| typedef F22<T> = List<A> Function<A>(core.List<core.int> x) Function();
|
|
|
| -
|
| Function f0([Function x]) => null;
|
| core.List<core.int> f1(int x) => null;
|
| List<int> f2(List<int> x) => null;
|
| @@ -72,7 +68,6 @@ Function Function<A>(Function x) f20() => null;
|
| List<int> Function<A>(List<Function> x) f21() => null;
|
| List<A> Function<A>(core.List<core.int> x) f22() => null;
|
|
|
| -
|
| class U68<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -102,7 +97,6 @@ class U68<T> {
|
| List<T> Function<A>(List<Function> x) Function() x21;
|
| List<A> Function<A>(core.List<core.int> x) Function() x22;
|
|
|
| -
|
| U68({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -130,7 +124,6 @@ class U68<T> {
|
| List<T> Function<A>(List<Function> x) m21() => null;
|
| List<A> Function<A>(core.List<core.int> x) m22() => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -179,7 +172,6 @@ class U68<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x)
|
| @@ -204,7 +196,6 @@ class U68<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// List<T> Function(List<T> x)
|
| @@ -237,12 +228,20 @@ class U68<T> {
|
| Expect.equals(tIsDynamic, m2 is F2<bool>);
|
| Expect.equals(tIsDynamic, confuse(m2) is F2<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x2 = (f2 as dynamic); });
|
| - Expect.throws(() { x2 = confuse(f2); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x2 = (f2 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x2 = confuse(f2);
|
| + });
|
| List<T> Function(List<T> x) l2;
|
| - Expect.throws(() { l2 = (f2 as dynamic); });
|
| - Expect.throws(() { l2 = confuse(f2); });
|
| + Expect.throws(() {
|
| + l2 = (f2 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l2 = confuse(f2);
|
| + });
|
| }
|
| List<T> Function(List<T> x) l2 = m2;
|
| // In checked mode, verifies the type.
|
| @@ -273,7 +272,6 @@ class U68<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// int Function([int x]) Function()
|
| @@ -298,7 +296,6 @@ class U68<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(List<Function> x0) Function()
|
| @@ -323,7 +320,6 @@ class U68<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function(int x, [List<T> x2]) Function()
|
| @@ -356,12 +352,20 @@ class U68<T> {
|
| Expect.equals(tIsDynamic, m6 is F6<bool>);
|
| Expect.equals(tIsDynamic, confuse(m6) is F6<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x6 = (f6 as dynamic); });
|
| - Expect.throws(() { x6 = confuse(f6); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x6 = (f6 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x6 = confuse(f6);
|
| + });
|
| int Function(int x, [List<T> x2]) Function() l6;
|
| - Expect.throws(() { l6 = (f6 as dynamic); });
|
| - Expect.throws(() { l6 = confuse(f6); });
|
| + Expect.throws(() {
|
| + l6 = (f6 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l6 = confuse(f6);
|
| + });
|
| }
|
| int Function(int x, [List<T> x2]) Function() l6 = m6;
|
| // In checked mode, verifies the type.
|
| @@ -392,7 +396,6 @@ class U68<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function([List<T> x]) Function()
|
| @@ -425,12 +428,20 @@ class U68<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([List<T> x]) 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([List<T> x]) Function() l8 = m8;
|
| // In checked mode, verifies the type.
|
| @@ -454,14 +465,14 @@ class U68<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(int y, [Function x]) Function());
|
| + Expect
|
| + .isTrue(m9 is List<Function> Function(int y, [Function x]) Function());
|
| Expect.isTrue(confuse(m9) is F9);
|
| // In checked mode, verifies the type.
|
| x9 = m9;
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x1, [core.List<core.int> x2]) Function()
|
| @@ -479,14 +490,15 @@ class U68<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(int x1, [core.List<core.int> x2]) Function());
|
| + Expect.isTrue(m10 is List<Function> Function(int x1,
|
| + [core.List<core.int> x2])
|
| + Function());
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| l10 = m10;
|
| x10 = confuse(m10);
|
| l10 = confuse(m10);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function({int x}) Function()
|
| @@ -511,7 +523,6 @@ class U68<T> {
|
| l11 = m11;
|
| x11 = confuse(m11);
|
| l11 = confuse(m11);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(core.List<core.int> x) Function()
|
| @@ -529,14 +540,14 @@ class U68<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(core.List<core.int> x) Function());
|
| + Expect.isTrue(
|
| + m12 is core.List<core.int> Function(core.List<core.int> x) 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 x0, [int x]) Function()
|
| @@ -569,12 +580,20 @@ class U68<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 x0, [int x]) 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 x0, [int x]) Function() l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -613,12 +632,20 @@ class U68<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([List<Function> x1]) 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([List<Function> x1]) Function() l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -657,12 +684,20 @@ class U68<T> {
|
| Expect.equals(tIsDynamic, m15 is F15<bool>);
|
| Expect.equals(tIsDynamic, confuse(m15) is F15<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x15 = (f15 as dynamic); });
|
| - Expect.throws(() { x15 = confuse(f15); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x15 = (f15 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x15 = confuse(f15);
|
| + });
|
| List<T> Function({List<T> x}) Function() l15;
|
| - Expect.throws(() { l15 = (f15 as dynamic); });
|
| - Expect.throws(() { l15 = confuse(f15); });
|
| + Expect.throws(() {
|
| + l15 = (f15 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l15 = confuse(f15);
|
| + });
|
| }
|
| List<T> Function({List<T> x}) Function() l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -693,7 +728,6 @@ class U68<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(int x0, [List<T> x]) Function()
|
| @@ -726,12 +760,20 @@ class U68<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 x0, [List<T> x]) 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 x0, [List<T> x]) Function() l17 = m17;
|
| // In checked mode, verifies the type.
|
| @@ -762,7 +804,6 @@ class U68<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int x, [core.List<core.int> x2]) Function()
|
| @@ -780,14 +821,14 @@ class U68<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int x, [core.List<core.int> x2]) Function());
|
| + Expect.isTrue(
|
| + m19 is void Function(int x, [core.List<core.int> x2]) Function());
|
| Expect.isTrue(confuse(m19) is F19);
|
| // In checked mode, verifies the type.
|
| x19 = m19;
|
| l19 = m19;
|
| x19 = confuse(m19);
|
| l19 = confuse(m19);
|
| -
|
| }
|
|
|
| /// Function Function<A>(Function x) Function()
|
| @@ -812,7 +853,6 @@ class U68<T> {
|
| l20 = m20;
|
| x20 = confuse(m20);
|
| l20 = confuse(m20);
|
| -
|
| }
|
|
|
| /// List<T> Function<A>(List<Function> x) Function()
|
| @@ -845,12 +885,20 @@ class U68<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<Function> 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<Function> x) Function() l21 = m21;
|
| // In checked mode, verifies the type.
|
| @@ -881,10 +929,7 @@ class U68<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -892,4 +937,3 @@ void main() {
|
| new U68<int>(tIsInt: true).runTests();
|
| new U68<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|