| Index: tests/language/function_type/function_type92_test.dart
|
| diff --git a/tests/language/function_type/function_type92_test.dart b/tests/language/function_type/function_type92_test.dart
|
| index cc11801b6b0fb0655424aaa507b2dcce326d78d2..73db9fc5e4d03bb58b553021a1302413b6e8c47b 100644
|
| --- a/tests/language/function_type/function_type92_test.dart
|
| +++ b/tests/language/function_type/function_type92_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, [core.List<core.int> x]);
|
| typedef F1<T> = core.List<core.int> Function(int x0, [List<Function> x]);
|
| typedef F2<T> = Function([Function x]);
|
| @@ -35,7 +31,8 @@ typedef F8<T> = Function Function(int x, [List<T> x2]) Function();
|
| typedef F9<T> = List<Function> Function(int x0, {Function x}) Function();
|
| typedef F10<T> = List<Function> Function([List<T> x]) Function();
|
| typedef F11<T> = core.List<core.int> Function(int y, [Function x]) Function();
|
| -typedef F12<T> = core.List<core.int> Function(int x1, [core.List<core.int> x2]) Function();
|
| +typedef F12<T> = core.List<core.int> Function(int x1, [core.List<core.int> x2])
|
| + Function();
|
| typedef F13<T> = List<T> Function({int x}) Function();
|
| typedef F14<T> = List<T> Function(core.List<core.int> x) Function();
|
| typedef F15<T> = Function(int x0, [int x]) Function();
|
| @@ -47,7 +44,6 @@ typedef F20<T> = Function Function<A>(List<A> x) Function();
|
| typedef F21<T> = Function<A>(int x) Function();
|
| typedef F22<T> = void Function<A>(Function x) Function();
|
|
|
| -
|
| Function f0(int y, [core.List<core.int> x]) => null;
|
| core.List<core.int> f1(int x0, [List<Function> x]) => null;
|
| f2([Function x]) => null;
|
| @@ -72,7 +68,6 @@ Function Function<A>(List<A> x) f20() => null;
|
| Function<A>(int x) f21() => null;
|
| void Function<A>(Function x) f22() => null;
|
|
|
| -
|
| class U92<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -102,7 +97,6 @@ class U92<T> {
|
| Function<A>(int x) Function() x21;
|
| void Function<A>(Function x) Function() x22;
|
|
|
| -
|
| U92({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -130,7 +124,6 @@ class U92<T> {
|
| Function<A>(int x) m21() => null;
|
| void Function<A>(Function x) m22() => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -179,7 +172,6 @@ class U92<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x0, [List<Function> x])
|
| @@ -197,14 +189,14 @@ class U92<T> {
|
| }
|
|
|
| Expect.isTrue(m1 is F1);
|
| - Expect.isTrue(m1 is core.List<core.int> Function(int x0, [List<Function> x]));
|
| + Expect
|
| + .isTrue(m1 is core.List<core.int> Function(int x0, [List<Function> x]));
|
| Expect.isTrue(confuse(m1) is F1);
|
| // In checked mode, verifies the type.
|
| x1 = m1;
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// Function([Function x])
|
| @@ -229,7 +221,6 @@ class U92<T> {
|
| l2 = m2;
|
| x2 = confuse(m2);
|
| l2 = confuse(m2);
|
| -
|
| }
|
|
|
| /// int Function<A>(int x)
|
| @@ -254,7 +245,6 @@ class U92<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// int Function(int x, [int x2]) Function()
|
| @@ -279,7 +269,6 @@ class U92<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int y, {List<Function> x}) Function()
|
| @@ -304,7 +293,6 @@ class U92<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// Function Function([int x]) Function()
|
| @@ -329,7 +317,6 @@ class U92<T> {
|
| l6 = m6;
|
| x6 = confuse(m6);
|
| l6 = confuse(m6);
|
| -
|
| }
|
|
|
| /// Function Function(List<Function> x0) Function()
|
| @@ -354,7 +341,6 @@ class U92<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int x, [List<T> x2]) Function()
|
| @@ -387,12 +373,20 @@ class U92<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 x, [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 x, [List<T> x2]) Function() l8 = m8;
|
| // In checked mode, verifies the type.
|
| @@ -416,14 +410,14 @@ class U92<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(int x0, {Function x}) Function());
|
| + Expect
|
| + .isTrue(m9 is List<Function> Function(int x0, {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([List<T> x]) Function()
|
| @@ -456,12 +450,20 @@ class U92<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.
|
| @@ -485,14 +487,14 @@ class U92<T> {
|
| }
|
|
|
| Expect.isTrue(m11 is F11);
|
| - Expect.isTrue(m11 is core.List<core.int> Function(int y, [Function x]) Function());
|
| + Expect.isTrue(
|
| + m11 is core.List<core.int> Function(int y, [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(int x1, [core.List<core.int> x2]) Function()
|
| @@ -500,7 +502,8 @@ class U92<T> {
|
| Expect.isTrue(f12 is F12);
|
| Expect.isTrue(confuse(f12) is F12);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int x1, [core.List<core.int> x2]) Function() l12;
|
| + core.List<core.int> Function(int x1, [core.List<core.int> x2]) Function()
|
| + l12;
|
| // The static function f12 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x12 = f12 as dynamic;
|
| @@ -510,14 +513,15 @@ class U92<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x1, [core.List<core.int> x2]) Function());
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int x1,
|
| + [core.List<core.int> x2])
|
| + 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}) Function()
|
| @@ -550,12 +554,20 @@ class U92<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}) 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}) Function() l13 = m13;
|
| // In checked mode, verifies the type.
|
| @@ -594,12 +606,20 @@ class U92<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(core.List<core.int> 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(core.List<core.int> x) Function() l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -630,7 +650,6 @@ class U92<T> {
|
| l15 = m15;
|
| x15 = confuse(m15);
|
| l15 = confuse(m15);
|
| -
|
| }
|
|
|
| /// Function([List<Function> x1]) Function()
|
| @@ -655,7 +674,6 @@ class U92<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function({List<T> x}) Function()
|
| @@ -688,12 +706,20 @@ class U92<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({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({List<T> x}) Function() l17 = m17;
|
| // In checked mode, verifies the type.
|
| @@ -724,7 +750,6 @@ class U92<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int x0, [List<T> x]) Function()
|
| @@ -757,12 +782,20 @@ class U92<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(int x0, [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(int x0, [List<T> x]) Function() l19 = m19;
|
| // In checked mode, verifies the type.
|
| @@ -793,7 +826,6 @@ class U92<T> {
|
| l20 = m20;
|
| x20 = confuse(m20);
|
| l20 = confuse(m20);
|
| -
|
| }
|
|
|
| /// Function<A>(int x) Function()
|
| @@ -818,7 +850,6 @@ class U92<T> {
|
| l21 = m21;
|
| x21 = confuse(m21);
|
| l21 = confuse(m21);
|
| -
|
| }
|
|
|
| /// void Function<A>(Function x) Function()
|
| @@ -843,10 +874,7 @@ class U92<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -854,4 +882,3 @@ void main() {
|
| new U92<int>(tIsInt: true).runTests();
|
| new U92<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|