| Index: tests/language/function_type/function_type1_test.dart
|
| diff --git a/tests/language/function_type/function_type1_test.dart b/tests/language/function_type/function_type1_test.dart
|
| index f75b3435252827cc19f8a209ca60141336d3ff81..b445f11b843acfa090347140b2a68d4bfc03a957 100644
|
| --- a/tests/language/function_type/function_type1_test.dart
|
| +++ b/tests/language/function_type/function_type1_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> = int Function([int x]);
|
| typedef F1<T> = Function Function([List<T> x]);
|
| typedef F2<T> = core.List<core.int> Function(core.List<core.int> x);
|
| @@ -36,9 +32,11 @@ typedef F9<T> = Function Function(int x1, {List<T> x}) Function(int x);
|
| typedef F10<T> = List<Function> Function(List<Function> x) Function(int x);
|
| typedef F11<T> = List<Function> Function(int y, [List<T> x]) Function(int x);
|
| typedef F12<T> = core.List<core.int> Function([Function x1]) Function(int x);
|
| -typedef F13<T> = core.List<core.int> Function({core.List<core.int> x}) Function(int x);
|
| +typedef F13<T> = core.List<core.int> Function({core.List<core.int> x}) Function(
|
| + int x);
|
| typedef F14<T> = List<T> Function(int y, {int x}) Function(int x);
|
| -typedef F15<T> = List<T> Function(int x1, [core.List<core.int> x]) Function(int x);
|
| +typedef F15<T> = List<T> Function(int x1, [core.List<core.int> x]) Function(
|
| + int x);
|
| typedef F16<T> = Function(int x1) Function(int x);
|
| typedef F17<T> = Function(int x, [List<Function> x1]) Function(int x);
|
| typedef F18<T> = Function(int y, {List<T> x}) Function(int x);
|
| @@ -48,7 +46,6 @@ typedef F21<T> = List<Function> Function<A>(Function x) Function(int x);
|
| typedef F22<T> = Function<A>(List<Function> x) Function(int x);
|
| typedef F23<T> = void Function<A>(core.List<core.int> x) Function(int x);
|
|
|
| -
|
| int f0([int x]) => null;
|
| Function f1([List<int> x]) => null;
|
| core.List<core.int> f2(core.List<core.int> x) => null;
|
| @@ -74,7 +71,6 @@ List<Function> Function<A>(Function x) f21(int x) => null;
|
| Function<A>(List<Function> x) f22(int x) => null;
|
| void Function<A>(core.List<core.int> x) f23(int x) => null;
|
|
|
| -
|
| class U1<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -105,7 +101,6 @@ class U1<T> {
|
| Function<A>(List<Function> x) Function(int x) x22;
|
| void Function<A>(core.List<core.int> x) Function(int x) x23;
|
|
|
| -
|
| U1({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -134,7 +129,6 @@ class U1<T> {
|
| Function<A>(List<Function> x) m22(int x) => null;
|
| void Function<A>(core.List<core.int> x) m23(int x) => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -184,7 +178,6 @@ class U1<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// Function Function([List<T> x])
|
| @@ -217,12 +210,20 @@ class U1<T> {
|
| Expect.equals(tIsDynamic, m1 is F1<bool>);
|
| Expect.equals(tIsDynamic, confuse(m1) is F1<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x1 = (f1 as dynamic); });
|
| - Expect.throws(() { x1 = confuse(f1); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x1 = (f1 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x1 = confuse(f1);
|
| + });
|
| Function Function([List<T> x]) l1;
|
| - Expect.throws(() { l1 = (f1 as dynamic); });
|
| - Expect.throws(() { l1 = confuse(f1); });
|
| + Expect.throws(() {
|
| + l1 = (f1 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l1 = confuse(f1);
|
| + });
|
| }
|
| Function Function([List<T> x]) l1 = m1;
|
| // In checked mode, verifies the type.
|
| @@ -253,7 +254,6 @@ class U1<T> {
|
| l2 = m2;
|
| x2 = confuse(m2);
|
| l2 = confuse(m2);
|
| -
|
| }
|
|
|
| /// Function(int y, {Function x})
|
| @@ -278,7 +278,6 @@ class U1<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// Function Function<A>(Function x)
|
| @@ -303,7 +302,6 @@ class U1<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int x1, {int x}) Function(int x)
|
| @@ -328,7 +326,6 @@ class U1<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function([core.List<core.int> x]) Function(int x)
|
| @@ -353,7 +350,6 @@ class U1<T> {
|
| l6 = m6;
|
| x6 = confuse(m6);
|
| l6 = confuse(m6);
|
| -
|
| }
|
|
|
| /// Function Function(int y, [int x]) Function(int x)
|
| @@ -378,7 +374,6 @@ class U1<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int x2, [List<Function> x3]) Function(int x)
|
| @@ -396,14 +391,14 @@ class U1<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int x2, [List<Function> x3]) Function(int x));
|
| + Expect.isTrue(
|
| + m8 is Function Function(int x2, [List<Function> x3]) Function(int x));
|
| Expect.isTrue(confuse(m8) is F8);
|
| // In checked mode, verifies the type.
|
| x8 = m8;
|
| l8 = m8;
|
| x8 = confuse(m8);
|
| l8 = confuse(m8);
|
| -
|
| }
|
|
|
| /// Function Function(int x1, {List<T> x}) Function(int x)
|
| @@ -436,12 +431,20 @@ class U1<T> {
|
| Expect.equals(tIsDynamic, m9 is F9<bool>);
|
| Expect.equals(tIsDynamic, confuse(m9) is F9<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x9 = (f9 as dynamic); });
|
| - Expect.throws(() { x9 = confuse(f9); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x9 = (f9 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x9 = confuse(f9);
|
| + });
|
| Function Function(int x1, {List<T> x}) Function(int x) l9;
|
| - Expect.throws(() { l9 = (f9 as dynamic); });
|
| - Expect.throws(() { l9 = confuse(f9); });
|
| + Expect.throws(() {
|
| + l9 = (f9 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l9 = confuse(f9);
|
| + });
|
| }
|
| Function Function(int x1, {List<T> x}) Function(int x) l9 = m9;
|
| // In checked mode, verifies the type.
|
| @@ -465,14 +468,14 @@ class U1<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(List<Function> x) Function(int x));
|
| + Expect.isTrue(
|
| + m10 is List<Function> Function(List<Function> x) Function(int x));
|
| Expect.isTrue(confuse(m10) is F10);
|
| // In checked mode, verifies the type.
|
| x10 = m10;
|
| l10 = m10;
|
| x10 = confuse(m10);
|
| l10 = confuse(m10);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int y, [List<T> x]) Function(int x)
|
| @@ -490,7 +493,8 @@ class U1<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is List<Function> Function(int y, [List<T> x]) Function(int x));
|
| + Expect.isTrue(
|
| + m11 is List<Function> Function(int y, [List<T> x]) Function(int x));
|
| Expect.isTrue(confuse(m11) is F11);
|
| // In checked mode, verifies the type.
|
| x11 = m11;
|
| @@ -505,12 +509,20 @@ class U1<T> {
|
| Expect.equals(tIsDynamic, m11 is F11<bool>);
|
| Expect.equals(tIsDynamic, confuse(m11) is F11<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x11 = (f11 as dynamic); });
|
| - Expect.throws(() { x11 = confuse(f11); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x11 = (f11 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x11 = confuse(f11);
|
| + });
|
| List<Function> Function(int y, [List<T> x]) Function(int x) l11;
|
| - Expect.throws(() { l11 = (f11 as dynamic); });
|
| - Expect.throws(() { l11 = confuse(f11); });
|
| + Expect.throws(() {
|
| + l11 = (f11 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l11 = confuse(f11);
|
| + });
|
| }
|
| List<Function> Function(int y, [List<T> x]) Function(int x) l11 = m11;
|
| // In checked mode, verifies the type.
|
| @@ -534,14 +546,14 @@ class U1<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function([Function x1]) Function(int x));
|
| + Expect.isTrue(
|
| + m12 is core.List<core.int> Function([Function x1]) Function(int x));
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| l12 = m12;
|
| x12 = confuse(m12);
|
| l12 = confuse(m12);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function({core.List<core.int> x}) Function(int x)
|
| @@ -559,14 +571,14 @@ class U1<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function({core.List<core.int> x}) Function(int x));
|
| + Expect.isTrue(m13 is core.List<core.int> Function({core.List<core.int> x})
|
| + Function(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| l13 = m13;
|
| x13 = confuse(m13);
|
| l13 = confuse(m13);
|
| -
|
| }
|
|
|
| /// List<T> Function(int y, {int x}) Function(int x)
|
| @@ -599,12 +611,20 @@ class U1<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, {int x}) Function(int x) 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, {int x}) Function(int x) l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -628,7 +648,8 @@ class U1<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int x1, [core.List<core.int> x]) Function(int x));
|
| + Expect.isTrue(m15 is List<T> Function(int x1, [core.List<core.int> x])
|
| + Function(int x));
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -643,14 +664,23 @@ class U1<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(int x1, [core.List<core.int> x]) Function(int x) 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(int x1, [core.List<core.int> x]) Function(int x) l15 = m15;
|
| + List<T> Function(int x1, [core.List<core.int> x]) Function(int x) l15 =
|
| + m15;
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| x15 = confuse(m15);
|
| @@ -679,7 +709,6 @@ class U1<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(int x, [List<Function> x1]) Function(int x)
|
| @@ -704,7 +733,6 @@ class U1<T> {
|
| l17 = m17;
|
| x17 = confuse(m17);
|
| l17 = confuse(m17);
|
| -
|
| }
|
|
|
| /// Function(int y, {List<T> x}) Function(int x)
|
| @@ -737,12 +765,20 @@ class U1<T> {
|
| Expect.equals(tIsDynamic, m18 is F18<bool>);
|
| Expect.equals(tIsDynamic, confuse(m18) is F18<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x18 = (f18 as dynamic); });
|
| - Expect.throws(() { x18 = confuse(f18); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x18 = (f18 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x18 = confuse(f18);
|
| + });
|
| Function(int y, {List<T> x}) Function(int x) l18;
|
| - Expect.throws(() { l18 = (f18 as dynamic); });
|
| - Expect.throws(() { l18 = confuse(f18); });
|
| + Expect.throws(() {
|
| + l18 = (f18 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l18 = confuse(f18);
|
| + });
|
| }
|
| Function(int y, {List<T> x}) Function(int x) l18 = m18;
|
| // In checked mode, verifies the type.
|
| @@ -773,7 +809,6 @@ class U1<T> {
|
| l19 = m19;
|
| x19 = confuse(m19);
|
| l19 = confuse(m19);
|
| -
|
| }
|
|
|
| /// void Function(List<T> x1) Function(int x)
|
| @@ -806,12 +841,20 @@ class U1<T> {
|
| Expect.equals(tIsDynamic, m20 is F20<bool>);
|
| Expect.equals(tIsDynamic, confuse(m20) is F20<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x20 = (f20 as dynamic); });
|
| - Expect.throws(() { x20 = confuse(f20); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x20 = (f20 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x20 = confuse(f20);
|
| + });
|
| void Function(List<T> x1) Function(int x) l20;
|
| - Expect.throws(() { l20 = (f20 as dynamic); });
|
| - Expect.throws(() { l20 = confuse(f20); });
|
| + Expect.throws(() {
|
| + l20 = (f20 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l20 = confuse(f20);
|
| + });
|
| }
|
| void Function(List<T> x1) Function(int x) l20 = m20;
|
| // In checked mode, verifies the type.
|
| @@ -835,14 +878,14 @@ class U1<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is List<Function> Function<A>(Function x) Function(int x));
|
| + Expect
|
| + .isTrue(m21 is List<Function> Function<A>(Function x) Function(int x));
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
| l21 = m21;
|
| x21 = confuse(m21);
|
| l21 = confuse(m21);
|
| -
|
| }
|
|
|
| /// Function<A>(List<Function> x) Function(int x)
|
| @@ -867,7 +910,6 @@ class U1<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
|
|
| /// void Function<A>(core.List<core.int> x) Function(int x)
|
| @@ -885,17 +927,15 @@ class U1<T> {
|
| }
|
|
|
| Expect.isTrue(m23 is F23);
|
| - Expect.isTrue(m23 is void Function<A>(core.List<core.int> x) Function(int x));
|
| + Expect
|
| + .isTrue(m23 is void Function<A>(core.List<core.int> x) Function(int x));
|
| Expect.isTrue(confuse(m23) is F23);
|
| // In checked mode, verifies the type.
|
| x23 = m23;
|
| l23 = m23;
|
| x23 = confuse(m23);
|
| l23 = confuse(m23);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -903,4 +943,3 @@ void main() {
|
| new U1<int>(tIsInt: true).runTests();
|
| new U1<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|