| Index: tests/language/function_type/function_type37_test.dart
|
| diff --git a/tests/language/function_type/function_type37_test.dart b/tests/language/function_type/function_type37_test.dart
|
| index 7eae60caf6d8297995d4e4a79f3ad74ea8d01367..c0b31fec34c4ab7cc12d72e72d1765e41366ad69 100644
|
| --- a/tests/language/function_type/function_type37_test.dart
|
| +++ b/tests/language/function_type/function_type37_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(core.List<core.int> x0);
|
| typedef F1<T> = List<Function> Function(int y, [List<Function> x]);
|
| typedef F2<T> = List<T> Function(int x0, [Function x]);
|
| @@ -33,10 +29,13 @@ typedef F6<T> = int Function(int y, {core.List<core.int> x}) Function(int x);
|
| typedef F7<T> = Function Function([Function x]) Function(int x);
|
| typedef F8<T> = Function Function(core.List<core.int> x1) Function(int x);
|
| typedef F9<T> = List<Function> Function(int x2, [int x3]) Function(int x);
|
| -typedef F10<T> = List<Function> Function(int x1, {List<Function> x}) Function(int x);
|
| +typedef F10<T> = List<Function> Function(int x1, {List<Function> x}) Function(
|
| + int x);
|
| typedef F11<T> = core.List<core.int> Function(int x) Function(int x);
|
| -typedef F12<T> = core.List<core.int> Function(int y, [List<Function> x]) Function(int x);
|
| -typedef F13<T> = core.List<core.int> Function(int x2, [List<T> x3]) Function(int x);
|
| +typedef F12<T> = core.List<core.int> Function(int y, [List<Function> x])
|
| + Function(int x);
|
| +typedef F13<T> = core.List<core.int> Function(int x2, [List<T> x3]) Function(
|
| + int x);
|
| typedef F14<T> = List<T> Function({Function x}) Function(int x);
|
| typedef F15<T> = List<T> Function(List<T> x) Function(int x);
|
| typedef F16<T> = Function(int x1, [Function x]) Function(int x);
|
| @@ -44,11 +43,11 @@ typedef F17<T> = Function([core.List<core.int> x1]) Function(int x);
|
| typedef F18<T> = void Function(int x, [int x1]) Function(int x);
|
| typedef F19<T> = void Function(int y, {List<Function> x}) Function(int x);
|
| typedef F20<T> = int Function<A>(Function x) Function(int x);
|
| -typedef F21<T> = core.List<core.int> Function<A>(List<Function> x) Function(int x);
|
| +typedef F21<T> = core.List<core.int> Function<A>(List<Function> x) Function(
|
| + int x);
|
| typedef F22<T> = A Function<A>(core.List<core.int> x) Function(int x);
|
| typedef F23<T> = void Function(B x) Function<B extends core.int>(int x);
|
|
|
| -
|
| int f0(core.List<core.int> x0) => null;
|
| List<Function> f1(int y, [List<Function> x]) => null;
|
| List<int> f2(int x0, [Function x]) => null;
|
| @@ -74,7 +73,6 @@ core.List<core.int> Function<A>(List<Function> x) f21(int x) => null;
|
| A Function<A>(core.List<core.int> x) f22(int x) => null;
|
| void Function(B x) f23<B extends core.int>(int x) => null;
|
|
|
| -
|
| class U37<T> {
|
| final bool tIsBool;
|
| final bool tIsInt;
|
| @@ -105,7 +103,6 @@ class U37<T> {
|
| A Function<A>(core.List<core.int> x) Function(int x) x22;
|
| void Function(B x) Function<B extends core.int>(int x) x23;
|
|
|
| -
|
| U37({this.tIsBool: false, this.tIsInt: false})
|
| : tIsDynamic = !tIsBool && !tIsInt;
|
|
|
| @@ -134,7 +131,6 @@ class U37<T> {
|
| A Function<A>(core.List<core.int> x) m22(int x) => null;
|
| void Function(B x) m23<B extends core.int>(int x) => null;
|
|
|
| -
|
| runTests() {
|
| testF0();
|
| testF1();
|
| @@ -184,7 +180,6 @@ class U37<T> {
|
| l0 = m0;
|
| x0 = confuse(m0);
|
| l0 = confuse(m0);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int y, [List<Function> x])
|
| @@ -209,7 +204,6 @@ class U37<T> {
|
| l1 = m1;
|
| x1 = confuse(m1);
|
| l1 = confuse(m1);
|
| -
|
| }
|
|
|
| /// List<T> Function(int x0, [Function x])
|
| @@ -242,12 +236,20 @@ class U37<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(int x0, [Function 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(int x0, [Function x]) l2 = m2;
|
| // In checked mode, verifies the type.
|
| @@ -278,7 +280,6 @@ class U37<T> {
|
| l3 = m3;
|
| x3 = confuse(m3);
|
| l3 = confuse(m3);
|
| -
|
| }
|
|
|
| /// Function<A>()
|
| @@ -303,7 +304,6 @@ class U37<T> {
|
| l4 = m4;
|
| x4 = confuse(m4);
|
| l4 = confuse(m4);
|
| -
|
| }
|
|
|
| /// int Function(int x, [Function x1]) Function(int x)
|
| @@ -328,7 +328,6 @@ class U37<T> {
|
| l5 = m5;
|
| x5 = confuse(m5);
|
| l5 = confuse(m5);
|
| -
|
| }
|
|
|
| /// int Function(int y, {core.List<core.int> x}) Function(int x)
|
| @@ -346,14 +345,14 @@ class U37<T> {
|
| }
|
|
|
| Expect.isTrue(m6 is F6);
|
| - Expect.isTrue(m6 is int Function(int y, {core.List<core.int> x}) Function(int x));
|
| + Expect.isTrue(
|
| + m6 is int Function(int y, {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([Function x]) Function(int x)
|
| @@ -378,7 +377,6 @@ class U37<T> {
|
| l7 = m7;
|
| x7 = confuse(m7);
|
| l7 = confuse(m7);
|
| -
|
| }
|
|
|
| /// Function Function(core.List<core.int> x1) Function(int x)
|
| @@ -396,14 +394,14 @@ class U37<T> {
|
| }
|
|
|
| Expect.isTrue(m8 is F8);
|
| - Expect.isTrue(m8 is Function Function(core.List<core.int> x1) Function(int x));
|
| + Expect.isTrue(
|
| + m8 is Function Function(core.List<core.int> 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);
|
| -
|
| }
|
|
|
| /// List<Function> Function(int x2, [int x3]) Function(int x)
|
| @@ -421,14 +419,14 @@ class U37<T> {
|
| }
|
|
|
| Expect.isTrue(m9 is F9);
|
| - Expect.isTrue(m9 is List<Function> Function(int x2, [int x3]) Function(int x));
|
| + Expect.isTrue(
|
| + m9 is List<Function> Function(int x2, [int x3]) Function(int x));
|
| 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, {List<Function> x}) Function(int x)
|
| @@ -446,14 +444,14 @@ class U37<T> {
|
| }
|
|
|
| Expect.isTrue(m10 is F10);
|
| - Expect.isTrue(m10 is List<Function> Function(int x1, {List<Function> x}) Function(int x));
|
| + Expect.isTrue(m10 is List<Function> Function(int x1, {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);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x) Function(int x)
|
| @@ -478,7 +476,6 @@ class U37<T> {
|
| l11 = m11;
|
| x11 = confuse(m11);
|
| l11 = confuse(m11);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int y, [List<Function> x]) Function(int x)
|
| @@ -496,14 +493,14 @@ class U37<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int y, [List<Function> x]) Function(int x));
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int y, [List<Function> 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);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function(int x2, [List<T> x3]) Function(int x)
|
| @@ -521,7 +518,8 @@ class U37<T> {
|
| }
|
|
|
| Expect.isTrue(m13 is F13);
|
| - Expect.isTrue(m13 is core.List<core.int> Function(int x2, [List<T> x3]) Function(int x));
|
| + Expect.isTrue(m13 is core.List<core.int> Function(int x2, [List<T> x3])
|
| + Function(int x));
|
| Expect.isTrue(confuse(m13) is F13);
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| @@ -536,14 +534,23 @@ class U37<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);
|
| + });
|
| core.List<core.int> Function(int x2, [List<T> x3]) 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);
|
| + });
|
| }
|
| - core.List<core.int> Function(int x2, [List<T> x3]) Function(int x) l13 = m13;
|
| + core.List<core.int> Function(int x2, [List<T> x3]) Function(int x) l13 =
|
| + m13;
|
| // In checked mode, verifies the type.
|
| x13 = m13;
|
| x13 = confuse(m13);
|
| @@ -580,12 +587,20 @@ class U37<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.
|
| @@ -624,12 +639,20 @@ class U37<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(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(List<T> x) Function(int x) l15 = m15;
|
| // In checked mode, verifies the type.
|
| @@ -660,7 +683,6 @@ class U37<T> {
|
| l16 = m16;
|
| x16 = confuse(m16);
|
| l16 = confuse(m16);
|
| -
|
| }
|
|
|
| /// Function([core.List<core.int> x1]) Function(int x)
|
| @@ -685,7 +707,6 @@ class U37<T> {
|
| l17 = m17;
|
| x17 = confuse(m17);
|
| l17 = confuse(m17);
|
| -
|
| }
|
|
|
| /// void Function(int x, [int x1]) Function(int x)
|
| @@ -710,7 +731,6 @@ class U37<T> {
|
| l18 = m18;
|
| x18 = confuse(m18);
|
| l18 = confuse(m18);
|
| -
|
| }
|
|
|
| /// void Function(int y, {List<Function> x}) Function(int x)
|
| @@ -728,14 +748,14 @@ class U37<T> {
|
| }
|
|
|
| Expect.isTrue(m19 is F19);
|
| - Expect.isTrue(m19 is void Function(int y, {List<Function> x}) Function(int x));
|
| + Expect.isTrue(
|
| + m19 is void Function(int y, {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);
|
| -
|
| }
|
|
|
| /// int Function<A>(Function x) Function(int x)
|
| @@ -760,7 +780,6 @@ class U37<T> {
|
| l20 = m20;
|
| x20 = confuse(m20);
|
| l20 = confuse(m20);
|
| -
|
| }
|
|
|
| /// core.List<core.int> Function<A>(List<Function> x) Function(int x)
|
| @@ -778,14 +797,14 @@ class U37<T> {
|
| }
|
|
|
| Expect.isTrue(m21 is F21);
|
| - Expect.isTrue(m21 is core.List<core.int> Function<A>(List<Function> x) Function(int x));
|
| + Expect.isTrue(m21 is core.List<core.int> 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);
|
| -
|
| }
|
|
|
| /// A Function<A>(core.List<core.int> x) Function(int x)
|
| @@ -810,7 +829,6 @@ class U37<T> {
|
| l22 = m22;
|
| x22 = confuse(m22);
|
| l22 = confuse(m22);
|
| -
|
| }
|
|
|
| /// void Function(B x) Function<B extends core.int>(int x)
|
| @@ -828,17 +846,15 @@ class U37<T> {
|
| }
|
|
|
| Expect.isTrue(m23 is F23);
|
| - Expect.isTrue(m23 is void Function(B x) Function<B extends core.int>(int x));
|
| + Expect
|
| + .isTrue(m23 is void Function(B x) Function<B extends core.int>(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() {
|
| @@ -846,4 +862,3 @@ void main() {
|
| new U37<int>(tIsInt: true).runTests();
|
| new U37<bool>(tIsBool: true).runTests();
|
| }
|
| -
|
|
|