| Index: tests/language/function_type/function_type73_test.dart
|
| diff --git a/tests/language/function_type/function_type73_test.dart b/tests/language/function_type/function_type73_test.dart
|
| index 6dd2edb97339aa6bd2b021e8e0c89725990fa717..4faebc723987f95bcdbb1ca4419483406b69c686 100644
|
| --- a/tests/language/function_type/function_type73_test.dart
|
| +++ b/tests/language/function_type/function_type73_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 x1, [Function x2]);
|
| typedef F1<T> = core.List<core.int> Function([int x1]);
|
| typedef F2<T> = List<T> Function([List<T> x1]);
|
| @@ -33,9 +29,11 @@ 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 x1, [List<T> x]) Function(int x);
|
| typedef F9<T> = List<Function> Function(Function x1) Function(int x);
|
| -typedef F10<T> = List<Function> Function(int x, [core.List<core.int> x1]) Function(int x);
|
| +typedef F10<T> = List<Function> Function(int x, [core.List<core.int> x1])
|
| + 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([core.List<core.int> x]) Function(int x);
|
| +typedef F12<T> = core.List<core.int> Function([core.List<core.int> x]) Function(
|
| + int x);
|
| typedef F13<T> = List<T> Function(int y, [int x]) Function(int x);
|
| typedef F14<T> = List<T> Function(int x2, [List<Function> x3]) Function(int x);
|
| typedef F15<T> = List<T> Function(int x1, {List<T> x}) Function(int x);
|
| @@ -47,7 +45,6 @@ typedef F20<T> = Function Function<A>(List<Function> x) Function(int x);
|
| typedef F21<T> = List<T> Function<A>(core.List<core.int> x) Function(int x);
|
| typedef F22<T> = List<A> Function<A>(List<T> x) Function(int x);
|
|
|
| -
|
| Function f0(int x0, [Function x1]) => null;
|
| core.List<core.int> f1([int x0]) => null;
|
| List<int> f2([List<int> x0]) => null;
|
| @@ -72,7 +69,6 @@ Function Function<A>(List<Function> x) f20(int x) => null;
|
| List<int> Function<A>(core.List<core.int> x) f21(int x) => null;
|
| List<A> Function<A>(List<int> x) f22(int x) => null;
|
|
|
| -
|
| class U73<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -102,7 +98,6 @@ class U73<T> {
|
| List<T> Function<A>(core.List<core.int> x) Function(int x) x21;
|
| List<A> Function<A>(List<T> x) Function(int x) x22;
|
|
|
| -
|
| U73({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -130,7 +125,6 @@ class U73<T> {
|
| List<T> Function<A>(core.List<core.int> x) m21(int x) => null;
|
| List<A> Function<A>(List<T> x) m22(int x) => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -179,7 +173,6 @@ class U73<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function([int x1])
|
| @@ -204,7 +197,6 @@ class U73<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// List<T> Function([List<T> x1])
|
| @@ -237,12 +229,20 @@ class U73<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> x1]) 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> x1]) l2 = m2;
|
| // In checked mode, verifies the type.
|
| @@ -273,7 +273,6 @@ class U73<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// int Function(int x1, [int x]) Function(int x)
|
| @@ -298,7 +297,6 @@ class U73<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function([List<Function> x1]) Function(int x)
|
| @@ -323,7 +321,6 @@ class U73<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function({List<T> x}) Function(int x)
|
| @@ -356,12 +353,20 @@ class U73<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({List<T> x}) Function(int x) 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({List<T> x}) Function(int x) l6 = m6;
|
| // In checked mode, verifies the type.
|
| @@ -392,7 +397,6 @@ class U73<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int x1, [List<T> x]) Function(int x)
|
| @@ -425,12 +429,20 @@ class U73<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> x]) Function(int x) 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> x]) Function(int x) l8 = m8;
|
| // In checked mode, verifies the type.
|
| @@ -461,7 +473,6 @@ class U73<T> {
|
| l9 = m9;
|
| x9 = confuse(m9);
|
| l9 = confuse(m9);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x, [core.List<core.int> x1]) Function(int x)
|
| @@ -469,7 +480,8 @@ class U73<T> {
|
| Expect.isTrue(f10 is F10);
|
| Expect.isTrue(confuse(f10) is F10);
|
| // In checked mode, verifies the type.
|
| - List<Function> Function(int x, [core.List<core.int> x1]) Function(int x) l10;
|
| + List<Function> Function(int x, [core.List<core.int> x1]) Function(int x)
|
| + l10;
|
| // The static function f10 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x10 = f10 as dynamic;
|
| @@ -479,14 +491,15 @@ class U73<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(int x, [core.List<core.int> x1]) Function(int x));
|
| + Expect.isTrue(m10 is List<Function> Function(int x,
|
| + [core.List<core.int> x1])
|
| + 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);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x1, {int x}) Function(int x)
|
| @@ -504,14 +517,14 @@ class U73<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(int x1, {int x}) Function(int x));
|
| + Expect.isTrue(
|
| + m11 is core.List<core.int> Function(int x1, {int x}) Function(int x));
|
| 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> x]) Function(int x)
|
| @@ -529,14 +542,14 @@ class U73<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function([core.List<core.int> x]) Function(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function([core.List<core.int> x])
|
| + 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);
|
| -
|
| }
|
|
|
| /// List<T> Function(int y, [int x]) Function(int x)
|
| @@ -569,12 +582,20 @@ class U73<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 y, [int x]) Function(int x) 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 y, [int x]) Function(int x) l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -598,7 +619,8 @@ class U73<T> {
|
| }
|
|
|
| Expect.isTrue(m14 is F14);
|
| - Expect.isTrue(m14 is List<T> Function(int x2, [List<Function> x3]) Function(int x));
|
| + Expect.isTrue(
|
| + m14 is List<T> Function(int x2, [List<Function> x3]) Function(int x));
|
| Expect.isTrue(confuse(m14) is F14);
|
| // In checked mode, verifies the type.
|
| x14 = m14;
|
| @@ -613,12 +635,20 @@ class U73<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 x2, [List<Function> x3]) 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 x2, [List<Function> x3]) Function(int x) l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -657,12 +687,20 @@ class U73<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, {List<T> 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, {List<T> x}) Function(int x) l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -693,7 +731,6 @@ class U73<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function(int y, [List<T> x]) Function(int x)
|
| @@ -726,12 +763,20 @@ class U73<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 y, [List<T> x]) Function(int x) 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 y, [List<T> x]) Function(int x) l17 = m17;
|
| // In checked mode, verifies the type.
|
| @@ -762,7 +807,6 @@ class U73<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function({core.List<core.int> x}) Function(int x)
|
| @@ -780,14 +824,14 @@ class U73<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function({core.List<core.int> x}) Function(int x));
|
| + Expect
|
| + .isTrue(m19 is void Function({core.List<core.int> x}) Function(int x));
|
| 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>(List<Function> x) Function(int x)
|
| @@ -805,14 +849,14 @@ class U73<T> {
|
| }
|
|
|
| Expect.isTrue(m20 is F20);
|
| - Expect.isTrue(m20 is Function Function<A>(List<Function> x) Function(int x));
|
| + Expect
|
| + .isTrue(m20 is Function Function<A>(List<Function> x) Function(int x));
|
| Expect.isTrue(confuse(m20) is F20);
|
| // In checked mode, verifies the type.
|
| x20 = m20;
|
| l20 = m20;
|
| x20 = confuse(m20);
|
| l20 = confuse(m20);
|
| -
|
| }
|
|
|
| /// List<T> Function<A>(core.List<core.int> x) Function(int x)
|
| @@ -830,7 +874,8 @@ class U73<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is List<T> Function<A>(core.List<core.int> x) Function(int x));
|
| + Expect.isTrue(
|
| + m21 is List<T> Function<A>(core.List<core.int> x) Function(int x));
|
| Expect.isTrue(confuse(m21) is F21);
|
| // In checked mode, verifies the type.
|
| x21 = m21;
|
| @@ -845,12 +890,20 @@ class U73<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>(core.List<core.int> x) Function(int x) 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>(core.List<core.int> x) Function(int x) l21 = m21;
|
| // In checked mode, verifies the type.
|
| @@ -889,12 +942,20 @@ class U73<T> {
|
| Expect.equals(tIsDynamic, m22 is F22<bool>);
|
| Expect.equals(tIsDynamic, confuse(m22) is F22<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x22 = (f22 as dynamic); });
|
| - Expect.throws(() { x22 = confuse(f22); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x22 = (f22 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x22 = confuse(f22);
|
| + });
|
| List<A> Function<A>(List<T> x) Function(int x) l22;
|
| - Expect.throws(() { l22 = (f22 as dynamic); });
|
| - Expect.throws(() { l22 = confuse(f22); });
|
| + Expect.throws(() {
|
| + l22 = (f22 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l22 = confuse(f22);
|
| + });
|
| }
|
| List<A> Function<A>(List<T> x) Function(int x) l22 = m22;
|
| // In checked mode, verifies the type.
|
| @@ -902,8 +963,6 @@ class U73<T> {
|
| x22 = confuse(m22);
|
| }
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -911,4 +970,3 @@ void main() {
|
| new U73<int>(tIsInt: true).runTests();
|
| new U73<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|