Index: tests/language/function_type/function_type10_test.dart |
diff --git a/tests/language/function_type/function_type10_test.dart b/tests/language/function_type/function_type10_test.dart |
index 3ae2197893bafc2832ba99b47d39cf53590a48e8..9746f50396da8dc7f77aaf6f2a006513bf46d6d6 100644 |
--- a/tests/language/function_type/function_type10_test.dart |
+++ b/tests/language/function_type/function_type10_test.dart |
@@ -19,65 +19,41 @@ 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 y, {int x}); |
-typedef F1<T> |
- = Function Function(int y, {List<T> x}); |
-typedef F2<T> |
- = core.List<core.int> Function(int x0, {core.List<core.int> x}); |
-typedef F3<T> |
- = Function({List<Function> x}); |
-typedef F4<T> |
- = List<Function> Function<A>(List<Function> x); |
-typedef F5<T> |
- = int Function(Function x) Function<B extends core.int>(); |
-typedef F6<T> |
- = int Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>(); |
-typedef F7<T> |
- = Function Function([int x1]) Function<B extends core.int>(); |
-typedef F8<T> |
- = Function Function({List<Function> x}) Function<B extends core.int>(); |
-typedef F9<T> |
- = Function Function() Function<B extends core.int>(); |
-typedef F10<T> |
- = List<Function> Function(int x1, |
- [List<Function> x]) Function<B extends core.int>(); |
-typedef F11<T> |
- = List<Function> Function([List<T> x1]) Function<B extends core.int>(); |
-typedef F12<T> |
- = core.List<core.int> Function(int x, |
- [Function x1]) Function<B extends core.int>(); |
-typedef F13<T> |
- = core.List<core.int> Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>(); |
-typedef F14<T> |
- = List<T> Function([Function x]) Function<B extends core.int>(); |
-typedef F15<T> |
- = List<T> Function(core.List<core.int> x1) Function<B extends core.int>(); |
-typedef F16<T> |
- = Function(int x2, [int x3]) Function<B extends core.int>(); |
-typedef F17<T> |
- = Function(int x1, {List<Function> x}) Function<B extends core.int>(); |
-typedef F18<T> |
- = void Function(int x) Function<B extends core.int>(); |
-typedef F19<T> |
- = void Function(int y, [List<Function> x]) Function<B extends core.int>(); |
-typedef F20<T> |
- = void Function(int x2, [List<T> x3]) Function<B extends core.int>(); |
-typedef F21<T> |
- = List<Function> Function<A>( |
- core.List<core.int> x) Function<B extends core.int>(); |
-typedef F22<T> |
- = Function<A>(List<T> x) Function<B extends core.int>(); |
-typedef F23<T> |
- = void Function<A>() Function<B extends core.int>(); |
+typedef F0<T> = int Function(int y, {int x}); |
+typedef F1<T> = Function Function(int y, {List<T> x}); |
+typedef F2<T> = core.List<core.int> Function(int x0, {core.List<core.int> x}); |
+typedef F3<T> = Function({List<Function> x}); |
+typedef F4<T> = List<Function> Function<A>(List<Function> x); |
+typedef F5<T> = int Function(Function x) Function<B extends core.int>(); |
+typedef F6<T> = int Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>(); |
+typedef F7<T> = Function Function([int x1]) Function<B extends core.int>(); |
+typedef F8<T> = Function Function({List<Function> x}) |
+ Function<B extends core.int>(); |
+typedef F9<T> = Function Function() Function<B extends core.int>(); |
+typedef F10<T> = List<Function> Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>(); |
+typedef F11<T> = List<Function> Function([List<T> x1]) |
+ Function<B extends core.int>(); |
+typedef F12<T> = core.List<core.int> Function(int x, [Function x1]) |
+ Function<B extends core.int>(); |
+typedef F13<T> = core.List<core.int> Function(int y, {core.List<core.int> x}) |
+ Function<B extends core.int>(); |
+typedef F14<T> = List<T> Function([Function x]) Function<B extends core.int>(); |
+typedef F15<T> = List<T> Function(core.List<core.int> x1) |
+ Function<B extends core.int>(); |
+typedef F16<T> = Function(int x2, [int x3]) Function<B extends core.int>(); |
+typedef F17<T> = Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>(); |
+typedef F18<T> = void Function(int x) Function<B extends core.int>(); |
+typedef F19<T> = void Function(int y, [List<Function> x]) |
+ Function<B extends core.int>(); |
+typedef F20<T> = void Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>(); |
+typedef F21<T> = List<Function> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>(); |
+typedef F22<T> = Function<A>(List<T> x) Function<B extends core.int>(); |
+typedef F23<T> = void Function<A>() Function<B extends core.int>(); |
int f0(int y, {int x}) => null; |
Function f1(int y, {List<int> x}) => null; |
@@ -124,13 +100,13 @@ class U10<T> { |
Function Function([int x1]) Function<B extends core.int>() x7; |
Function Function({List<Function> x}) Function<B extends core.int>() x8; |
Function Function() Function<B extends core.int>() x9; |
- List<Function> Function(int x1, |
- [List<Function> x]) Function<B extends core.int>() x10; |
+ List<Function> Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>() x10; |
List<Function> Function([List<T> x1]) Function<B extends core.int>() x11; |
- core.List<core.int> Function(int x, |
- [Function x1]) Function<B extends core.int>() x12; |
- core.List<core.int> Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>() x13; |
+ core.List<core.int> Function(int x, [Function x1]) |
+ Function<B extends core.int>() x12; |
+ core.List<core.int> Function(int y, {core.List<core.int> x}) |
+ Function<B extends core.int>() x13; |
List<T> Function([Function x]) Function<B extends core.int>() x14; |
List<T> Function(core.List<core.int> x1) Function<B extends core.int>() x15; |
Function(int x2, [int x3]) Function<B extends core.int>() x16; |
@@ -138,8 +114,8 @@ class U10<T> { |
void Function(int x) Function<B extends core.int>() x18; |
void Function(int y, [List<Function> x]) Function<B extends core.int>() x19; |
void Function(int x2, [List<T> x3]) Function<B extends core.int>() x20; |
- List<Function> Function<A>( |
- core.List<core.int> x) Function<B extends core.int>() x21; |
+ List<Function> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>() x21; |
Function<A>(List<T> x) Function<B extends core.int>() x22; |
void Function<A>() Function<B extends core.int>() x23; |
@@ -256,7 +232,7 @@ class U10<T> { |
Expect.equals(tIsDynamic, m1 is F1<bool>); |
Expect.equals(tIsDynamic, confuse(m1) is F1<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x1 = (f1 as dynamic); |
}); |
@@ -392,8 +368,8 @@ class U10<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is int Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m6 is int Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m6) is F6); |
// In checked mode, verifies the type. |
x6 = m6; |
@@ -442,8 +418,8 @@ class U10<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function( |
- {List<Function> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m8 is Function Function({List<Function> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -481,8 +457,8 @@ class U10<T> { |
Expect.isTrue(f10 is F10); |
Expect.isTrue(confuse(f10) is F10); |
// In checked mode, verifies the type. |
- List<Function> Function(int x1, |
- [List<Function> x]) Function<B extends core.int>() l10; |
+ List<Function> Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>() l10; |
// The static function f10 sets `T` to `int`. |
if (!tIsBool) { |
x10 = f10 as dynamic; |
@@ -492,8 +468,8 @@ class U10<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int x1, |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m10 is List<Function> Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -517,8 +493,8 @@ class U10<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is List<Function> Function( |
- [List<T> x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m11 is List<Function> Function([List<T> x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -533,7 +509,7 @@ class U10<T> { |
Expect.equals(tIsDynamic, m11 is F11<bool>); |
Expect.equals(tIsDynamic, confuse(m11) is F11<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x11 = (f11 as dynamic); |
}); |
@@ -562,8 +538,8 @@ class U10<T> { |
Expect.isTrue(f12 is F12); |
Expect.isTrue(confuse(f12) is F12); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int x, |
- [Function x1]) Function<B extends core.int>() l12; |
+ core.List<core.int> Function(int x, [Function x1]) |
+ Function<B extends core.int>() l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -573,8 +549,8 @@ class U10<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function(int x, |
- [Function x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m12 is core.List<core.int> Function(int x, [Function x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -588,8 +564,8 @@ class U10<T> { |
Expect.isTrue(f13 is F13); |
Expect.isTrue(confuse(f13) is F13); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>() l13; |
+ core.List<core.int> Function(int y, {core.List<core.int> x}) |
+ Function<B extends core.int>() l13; |
// The static function f13 sets `T` to `int`. |
if (!tIsBool) { |
x13 = f13 as dynamic; |
@@ -600,7 +576,8 @@ class U10<T> { |
Expect.isTrue(m13 is F13); |
Expect.isTrue(m13 is core.List<core.int> Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>()); |
+ {core.List<core.int> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -640,7 +617,7 @@ class U10<T> { |
Expect.equals(tIsDynamic, m14 is F14<bool>); |
Expect.equals(tIsDynamic, confuse(m14) is F14<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x14 = (f14 as dynamic); |
}); |
@@ -677,8 +654,8 @@ class U10<T> { |
} |
Expect.isTrue(m15 is F15); |
- Expect.isTrue(m15 is List<T> Function( |
- core.List<core.int> x1) Function<B extends core.int>()); |
+ Expect.isTrue(m15 is List<T> Function(core.List<core.int> x1) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m15) is F15); |
// In checked mode, verifies the type. |
x15 = m15; |
@@ -693,7 +670,7 @@ class U10<T> { |
Expect.equals(tIsDynamic, m15 is F15<bool>); |
Expect.equals(tIsDynamic, confuse(m15) is F15<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x15 = (f15 as dynamic); |
}); |
@@ -757,8 +734,8 @@ class U10<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function(int x1, |
- {List<Function> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m17 is Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -806,8 +783,8 @@ class U10<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function(int y, |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m19 is void Function(int y, [List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -831,8 +808,8 @@ class U10<T> { |
} |
Expect.isTrue(m20 is F20); |
- Expect.isTrue(m20 is void Function(int x2, |
- [List<T> x3]) Function<B extends core.int>()); |
+ Expect.isTrue(m20 is void Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m20) is F20); |
// In checked mode, verifies the type. |
x20 = m20; |
@@ -847,7 +824,7 @@ class U10<T> { |
Expect.equals(tIsDynamic, m20 is F20<bool>); |
Expect.equals(tIsDynamic, confuse(m20) is F20<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x20 = (f20 as dynamic); |
}); |
@@ -875,8 +852,8 @@ class U10<T> { |
Expect.isTrue(f21 is F21); |
Expect.isTrue(confuse(f21) is F21); |
// In checked mode, verifies the type. |
- List<Function> Function<A>( |
- core.List<core.int> x) Function<B extends core.int>() l21; |
+ List<Function> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>() l21; |
// The static function f21 sets `T` to `int`. |
if (!tIsBool) { |
x21 = f21 as dynamic; |
@@ -886,8 +863,8 @@ class U10<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is List<Function> Function<A>( |
- core.List<core.int> x) Function<B extends core.int>()); |
+ Expect.isTrue(m21 is List<Function> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |
@@ -926,7 +903,7 @@ class U10<T> { |
Expect.equals(tIsDynamic, m22 is F22<bool>); |
Expect.equals(tIsDynamic, confuse(m22) is F22<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x22 = (f22 as dynamic); |
}); |