| Index: tests/language/function_type/function_type5_test.dart
|
| diff --git a/tests/language/function_type/function_type5_test.dart b/tests/language/function_type/function_type5_test.dart
|
| index 2c6343e5b85c50ba728698848a9edbd2eb88fea7..fe68fc936b4218bf520e5bd54646a803bcca4a49 100644
|
| --- a/tests/language/function_type/function_type5_test.dart
|
| +++ b/tests/language/function_type/function_type5_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 x1]);
|
| typedef F1<T> = Function Function([List<T> x1]);
|
| typedef F2<T> = core.List<core.int> Function(core.List<core.int> x0);
|
| @@ -35,10 +31,13 @@ typedef F8<T> = Function Function(int x, [List<Function> x1]) Function(int x);
|
| typedef F9<T> = Function Function(int y, {List<T> x}) Function(int x);
|
| typedef F10<T> = List<Function> Function([List<Function> x]) Function(int x);
|
| typedef F11<T> = List<Function> Function(List<T> x1) Function(int x);
|
| -typedef F12<T> = core.List<core.int> Function(int x2, [Function x3]) Function(int x);
|
| -typedef F13<T> = core.List<core.int> Function(int x1, {core.List<core.int> x}) Function(int x);
|
| +typedef F12<T> = core.List<core.int> Function(int x2, [Function x3]) Function(
|
| + int x);
|
| +typedef F13<T> = core.List<core.int> Function(int x1, {core.List<core.int> x})
|
| + Function(int x);
|
| typedef F14<T> = List<T> Function(Function x) Function(int x);
|
| -typedef F15<T> = List<T> Function(int y, [core.List<core.int> x]) Function(int x);
|
| +typedef F15<T> = List<T> Function(int y, [core.List<core.int> x]) Function(
|
| + int x);
|
| typedef F16<T> = Function([int x1]) Function(int x);
|
| typedef F17<T> = Function({List<Function> x}) Function(int x);
|
| typedef F18<T> = Function() Function(int x);
|
| @@ -48,7 +47,6 @@ typedef F21<T> = List<Function> Function<A>(List<Function> x) Function(int x);
|
| typedef F22<T> = Function<A>(core.List<core.int> x) Function(int x);
|
| typedef F23<T> = void Function<A>(List<T> x) Function(int x);
|
|
|
| -
|
| int f0([int x0]) => null;
|
| Function f1([List<int> x0]) => null;
|
| core.List<core.int> f2(core.List<core.int> x0) => null;
|
| @@ -62,7 +60,8 @@ Function Function(int y, {List<int> x}) f9(int x) => null;
|
| List<Function> Function([List<Function> x]) f10(int x) => null;
|
| List<Function> Function(List<int> x0) f11(int x) => null;
|
| core.List<core.int> Function(int x0, [Function x1]) f12(int x) => null;
|
| -core.List<core.int> Function(int x0, {core.List<core.int> x}) f13(int x) => null;
|
| +core.List<core.int> Function(int x0, {core.List<core.int> x}) f13(int x) =>
|
| + null;
|
| List<int> Function(Function x) f14(int x) => null;
|
| List<int> Function(int y, [core.List<core.int> x]) f15(int x) => null;
|
| Function([int x0]) f16(int x) => null;
|
| @@ -74,7 +73,6 @@ List<Function> Function<A>(List<Function> x) f21(int x) => null;
|
| Function<A>(core.List<core.int> x) f22(int x) => null;
|
| void Function<A>(List<int> x) f23(int x) => null;
|
|
|
| -
|
| class U5<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -93,7 +91,8 @@ class U5<T> {
|
| List<Function> Function([List<Function> x]) Function(int x) x10;
|
| List<Function> Function(List<T> x1) Function(int x) x11;
|
| core.List<core.int> Function(int x2, [Function x3]) Function(int x) x12;
|
| - core.List<core.int> Function(int x1, {core.List<core.int> x}) Function(int x) x13;
|
| + core.List<core.int> Function(int x1, {core.List<core.int> x}) Function(int x)
|
| + x13;
|
| List<T> Function(Function x) Function(int x) x14;
|
| List<T> Function(int y, [core.List<core.int> x]) Function(int x) x15;
|
| Function([int x1]) Function(int x) x16;
|
| @@ -105,7 +104,6 @@ class U5<T> {
|
| Function<A>(core.List<core.int> x) Function(int x) x22;
|
| void Function<A>(List<T> x) Function(int x) x23;
|
|
|
| -
|
| U5({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -122,7 +120,8 @@ class U5<T> {
|
| List<Function> Function([List<Function> x]) m10(int x) => null;
|
| List<Function> Function(List<T> x0) m11(int x) => null;
|
| core.List<core.int> Function(int x0, [Function x1]) m12(int x) => null;
|
| - core.List<core.int> Function(int x0, {core.List<core.int> x}) m13(int x) => null;
|
| + core.List<core.int> Function(int x0, {core.List<core.int> x}) m13(int x) =>
|
| + null;
|
| List<T> Function(Function x) m14(int x) => null;
|
| List<T> Function(int y, [core.List<core.int> x]) m15(int x) => null;
|
| Function([int x0]) m16(int x) => null;
|
| @@ -134,7 +133,6 @@ class U5<T> {
|
| Function<A>(core.List<core.int> x) m22(int x) => null;
|
| void Function<A>(List<T> x) m23(int x) => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -184,7 +182,6 @@ class U5<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// Function Function([List<T> x1])
|
| @@ -217,12 +214,20 @@ class U5<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> x1]) 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> x1]) l1 = m1;
|
| // In checked mode, verifies the type.
|
| @@ -253,7 +258,6 @@ class U5<T> {
|
| l2 = m2;
|
| x2 = confuse(m2);
|
| l2 = confuse(m2);
|
| -
|
| }
|
|
|
| /// Function(int y, [List<Function> x])
|
| @@ -278,7 +282,6 @@ class U5<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// Function Function<A>()
|
| @@ -303,7 +306,6 @@ class U5<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int y, {int x}) Function(int x)
|
| @@ -328,7 +330,6 @@ class U5<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function(int x1, [core.List<core.int> x]) Function(int x)
|
| @@ -346,14 +347,14 @@ class U5<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int x1, [core.List<core.int> x]) Function(int x));
|
| + Expect.isTrue(
|
| + m6 is int Function(int x1, [core.List<core.int> x]) Function(int x));
|
| Expect.isTrue(confuse(m6) is F6);
|
| // In checked mode, verifies the type.
|
| x6 = m6;
|
| l6 = m6;
|
| x6 = confuse(m6);
|
| l6 = confuse(m6);
|
| -
|
| }
|
|
|
| /// Function Function(int x1) Function(int x)
|
| @@ -378,7 +379,6 @@ class U5<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(int x, [List<Function> x1]) Function(int x)
|
| @@ -396,14 +396,14 @@ class U5<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(int x, [List<Function> x1]) Function(int x));
|
| + Expect.isTrue(
|
| + m8 is Function Function(int x, [List<Function> x1]) 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 y, {List<T> x}) Function(int x)
|
| @@ -436,12 +436,20 @@ class U5<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 y, {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 y, {List<T> x}) Function(int x) l9 = m9;
|
| // In checked mode, verifies the type.
|
| @@ -465,14 +473,14 @@ class U5<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(List<T> x1) Function(int x)
|
| @@ -505,12 +513,20 @@ class U5<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(List<T> x1) 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(List<T> x1) Function(int x) l11 = m11;
|
| // In checked mode, verifies the type.
|
| @@ -534,14 +550,14 @@ class U5<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int x2, [Function x3]) Function(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int x2, [Function x3])
|
| + 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(int x1, {core.List<core.int> x}) Function(int x)
|
| @@ -549,7 +565,8 @@ class U5<T> {
|
| Expect.isTrue(f13 is F13);
|
| Expect.isTrue(confuse(f13) is F13);
|
| // In checked mode, verifies the type.
|
| - core.List<core.int> Function(int x1, {core.List<core.int> x}) Function(int x) l13;
|
| + core.List<core.int> Function(int x1, {core.List<core.int> x}) Function(
|
| + int x) l13;
|
| // The static function f13 sets `T` to `int`.
|
| if (!tIsBool) {
|
| x13 = f13 as dynamic;
|
| @@ -559,14 +576,15 @@ class U5<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(int x1, {core.List<core.int> x}) Function(int x));
|
| + Expect.isTrue(m13 is core.List<core.int> Function(int x1,
|
| + {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(Function x) Function(int x)
|
| @@ -599,12 +617,20 @@ class U5<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(Function 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(Function x) Function(int x) l14 = m14;
|
| // In checked mode, verifies the type.
|
| @@ -628,7 +654,8 @@ class U5<T> {
|
| }
|
|
|
| Expect.isTrue(m15 is F15);
|
| - Expect.isTrue(m15 is List<T> Function(int y, [core.List<core.int> x]) Function(int x));
|
| + Expect.isTrue(m15 is List<T> Function(int y, [core.List<core.int> x])
|
| + Function(int x));
|
| Expect.isTrue(confuse(m15) is F15);
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| @@ -643,14 +670,23 @@ class U5<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 y, [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 y, [core.List<core.int> x]) Function(int x) l15 = m15;
|
| + List<T> Function(int y, [core.List<core.int> x]) Function(int x) l15 =
|
| + m15;
|
| // In checked mode, verifies the type.
|
| x15 = m15;
|
| x15 = confuse(m15);
|
| @@ -679,7 +715,6 @@ class U5<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function({List<Function> x}) Function(int x)
|
| @@ -704,7 +739,6 @@ class U5<T> {
|
| l17 = m17;
|
| x17 = confuse(m17);
|
| l17 = confuse(m17);
|
| -
|
| }
|
|
|
| /// Function() Function(int x)
|
| @@ -729,7 +763,6 @@ class U5<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int x1, [List<Function> x]) Function(int x)
|
| @@ -747,14 +780,14 @@ class U5<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int x1, [List<Function> x]) Function(int x));
|
| + Expect.isTrue(
|
| + m19 is void Function(int x1, [List<Function> 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);
|
| -
|
| }
|
|
|
| /// void Function([List<T> x1]) Function(int x)
|
| @@ -787,12 +820,20 @@ class U5<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.
|
| @@ -816,14 +857,14 @@ class U5<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is List<Function> Function<A>(List<Function> x) Function(int x));
|
| + Expect.isTrue(
|
| + m21 is List<Function> Function<A>(List<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>(core.List<core.int> x) Function(int x)
|
| @@ -848,7 +889,6 @@ class U5<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
|
|
| /// void Function<A>(List<T> x) Function(int x)
|
| @@ -881,12 +921,20 @@ class U5<T> {
|
| Expect.equals(tIsDynamic, m23 is F23<bool>);
|
| Expect.equals(tIsDynamic, confuse(m23) is F23<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| - Expect.throws(() { x23 = (f23 as dynamic); });
|
| - Expect.throws(() { x23 = confuse(f23); });
|
| + if (typeAssertionsEnabled) {
|
| + Expect.throws(() {
|
| + x23 = (f23 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + x23 = confuse(f23);
|
| + });
|
| void Function<A>(List<T> x) Function(int x) l23;
|
| - Expect.throws(() { l23 = (f23 as dynamic); });
|
| - Expect.throws(() { l23 = confuse(f23); });
|
| + Expect.throws(() {
|
| + l23 = (f23 as dynamic);
|
| + });
|
| + Expect.throws(() {
|
| + l23 = confuse(f23);
|
| + });
|
| }
|
| void Function<A>(List<T> x) Function(int x) l23 = m23;
|
| // In checked mode, verifies the type.
|
| @@ -894,8 +942,6 @@ class U5<T> {
|
| x23 = confuse(m23);
|
| }
|
| }
|
| -
|
| -
|
| }
|
|
|
| void main() {
|
| @@ -903,4 +949,3 @@ void main() {
|
| new U5<int>(tIsInt: true).runTests();
|
| new U5<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|