Index: tests/language/function_type/function_type54_test.dart |
diff --git a/tests/language/function_type/function_type54_test.dart b/tests/language/function_type/function_type54_test.dart |
index f9b3b1c252f2f7114ea98759a91dcb01654adf9f..08ce48e441bd18367829e58bcbab65db0573cc50 100644 |
--- a/tests/language/function_type/function_type54_test.dart |
+++ b/tests/language/function_type/function_type54_test.dart |
@@ -19,62 +19,39 @@ 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, {List<T> x}); |
-typedef F1<T> |
- = List<Function> Function(int x0, {core.List<core.int> x}); |
-typedef F2<T> |
- = List<T> Function({List<Function> x}); |
-typedef F3<T> |
- = void Function(int x, [Function x2]); |
-typedef F4<T> |
- = List<A> Function<A>(A x); |
-typedef F5<T> |
- = int Function(List<Function> x) Function<B extends core.int>(); |
-typedef F6<T> |
- = int Function(int y, [List<T> x]) Function<B extends core.int>(); |
-typedef F7<T> |
- = Function Function([Function x1]) Function<B extends core.int>(); |
-typedef F8<T> |
- = Function Function({core.List<core.int> x}) Function<B extends core.int>(); |
-typedef F9<T> |
- = List<Function> Function(int y, {int x}) Function<B extends core.int>(); |
-typedef F10<T> |
- = List<Function> Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>(); |
-typedef F11<T> |
- = core.List<core.int> Function(int x1) Function<B extends core.int>(); |
-typedef F12<T> |
- = core.List<core.int> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>(); |
-typedef F13<T> |
- = core.List<core.int> Function(int y, |
- {List<T> x}) Function<B extends core.int>(); |
-typedef F14<T> |
- = List<T> Function([List<Function> x]) Function<B extends core.int>(); |
-typedef F15<T> |
- = List<T> Function(List<T> x1) Function<B extends core.int>(); |
-typedef F16<T> |
- = Function(int x2, [Function x3]) Function<B extends core.int>(); |
-typedef F17<T> |
- = Function(int x1, {core.List<core.int> x}) Function<B extends core.int>(); |
-typedef F18<T> |
- = void Function(Function x) Function<B extends core.int>(); |
-typedef F19<T> |
- = void Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>(); |
-typedef F20<T> |
- = int Function<A>() Function<B extends core.int>(); |
-typedef F21<T> |
- = core.List<core.int> Function<A>(A x) Function<B extends core.int>(); |
-typedef F22<T> |
- = A Function<A>(List<A> x) Function<B extends core.int>(); |
+typedef F0<T> = int Function(int y, {List<T> x}); |
+typedef F1<T> = List<Function> Function(int x0, {core.List<core.int> x}); |
+typedef F2<T> = List<T> Function({List<Function> x}); |
+typedef F3<T> = void Function(int x, [Function x2]); |
+typedef F4<T> = List<A> Function<A>(A x); |
+typedef F5<T> = int Function(List<Function> x) Function<B extends core.int>(); |
+typedef F6<T> = int Function(int y, [List<T> x]) Function<B extends core.int>(); |
+typedef F7<T> = Function Function([Function x1]) Function<B extends core.int>(); |
+typedef F8<T> = Function Function({core.List<core.int> x}) |
+ Function<B extends core.int>(); |
+typedef F9<T> = List<Function> Function(int y, {int x}) |
+ Function<B extends core.int>(); |
+typedef F10<T> = List<Function> Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>(); |
+typedef F11<T> = core.List<core.int> Function(int x1) |
+ Function<B extends core.int>(); |
+typedef F12<T> = core.List<core.int> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>(); |
+typedef F13<T> = core.List<core.int> Function(int y, {List<T> x}) |
+ Function<B extends core.int>(); |
+typedef F14<T> = List<T> Function([List<Function> x]) |
+ Function<B extends core.int>(); |
+typedef F15<T> = List<T> Function(List<T> x1) Function<B extends core.int>(); |
+typedef F16<T> = Function(int x2, [Function x3]) Function<B extends core.int>(); |
+typedef F17<T> = Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(); |
+typedef F18<T> = void Function(Function x) Function<B extends core.int>(); |
+typedef F19<T> = void Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>(); |
+typedef F20<T> = int Function<A>() Function<B extends core.int>(); |
+typedef F21<T> = core.List<core.int> Function<A>(A x) |
+ Function<B extends core.int>(); |
+typedef F22<T> = A Function<A>(List<A> x) Function<B extends core.int>(); |
int f0(int y, {List<int> x}) => null; |
List<Function> f1(int x0, {core.List<core.int> x}) => null; |
@@ -118,13 +95,13 @@ class U54<T> { |
Function Function([Function x1]) Function<B extends core.int>() x7; |
Function Function({core.List<core.int> x}) Function<B extends core.int>() x8; |
List<Function> Function(int y, {int x}) Function<B extends core.int>() x9; |
- List<Function> Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>() x10; |
+ List<Function> Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>() x10; |
core.List<core.int> Function(int x1) Function<B extends core.int>() x11; |
- core.List<core.int> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>() x12; |
- core.List<core.int> Function(int y, |
- {List<T> x}) Function<B extends core.int>() x13; |
+ core.List<core.int> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>() x12; |
+ core.List<core.int> Function(int y, {List<T> x}) |
+ Function<B extends core.int>() x13; |
List<T> Function([List<Function> x]) Function<B extends core.int>() x14; |
List<T> Function(List<T> x1) Function<B extends core.int>() x15; |
Function(int x2, [Function x3]) Function<B extends core.int>() x16; |
@@ -223,7 +200,7 @@ class U54<T> { |
Expect.equals(tIsDynamic, m0 is F0<bool>); |
Expect.equals(tIsDynamic, confuse(m0) is F0<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x0 = (f0 as dynamic); |
}); |
@@ -300,7 +277,7 @@ class U54<T> { |
Expect.equals(tIsDynamic, m2 is F2<bool>); |
Expect.equals(tIsDynamic, confuse(m2) is F2<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x2 = (f2 as dynamic); |
}); |
@@ -426,7 +403,7 @@ class U54<T> { |
Expect.equals(tIsDynamic, m6 is F6<bool>); |
Expect.equals(tIsDynamic, confuse(m6) is F6<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x6 = (f6 as dynamic); |
}); |
@@ -489,8 +466,8 @@ class U54<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function( |
- {core.List<core.int> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m8 is Function Function({core.List<core.int> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -514,8 +491,8 @@ class U54<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function(int y, |
- {int x}) Function<B extends core.int>()); |
+ Expect.isTrue(m9 is List<Function> Function(int y, {int x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -529,8 +506,8 @@ class U54<T> { |
Expect.isTrue(f10 is F10); |
Expect.isTrue(confuse(f10) is F10); |
// In checked mode, verifies the type. |
- List<Function> Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>() l10; |
+ List<Function> Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>() l10; |
// The static function f10 sets `T` to `int`. |
if (!tIsBool) { |
x10 = f10 as dynamic; |
@@ -541,7 +518,8 @@ class U54<T> { |
Expect.isTrue(m10 is F10); |
Expect.isTrue(m10 is List<Function> Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>()); |
+ [core.List<core.int> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -565,8 +543,8 @@ class U54<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is core.List<core.int> Function( |
- int x1) Function<B extends core.int>()); |
+ Expect.isTrue(m11 is core.List<core.int> Function(int x1) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -580,8 +558,8 @@ class U54<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, |
- [List<Function> x1]) Function<B extends core.int>() l12; |
+ core.List<core.int> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>() l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -592,7 +570,8 @@ class U54<T> { |
Expect.isTrue(m12 is F12); |
Expect.isTrue(m12 is core.List<core.int> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>()); |
+ [List<Function> x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -606,8 +585,8 @@ class U54<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, |
- {List<T> x}) Function<B extends core.int>() l13; |
+ core.List<core.int> Function(int y, {List<T> x}) |
+ Function<B extends core.int>() l13; |
// The static function f13 sets `T` to `int`. |
if (!tIsBool) { |
x13 = f13 as dynamic; |
@@ -617,8 +596,8 @@ class U54<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is core.List<core.int> Function(int y, |
- {List<T> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m13 is core.List<core.int> Function(int y, {List<T> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -633,15 +612,15 @@ class U54<T> { |
Expect.equals(tIsDynamic, m13 is F13<bool>); |
Expect.equals(tIsDynamic, confuse(m13) is F13<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x13 = (f13 as dynamic); |
}); |
Expect.throws(() { |
x13 = confuse(f13); |
}); |
- core.List<core.int> Function(int y, |
- {List<T> x}) Function<B extends core.int>() l13; |
+ core.List<core.int> Function(int y, {List<T> x}) |
+ Function<B extends core.int>() l13; |
Expect.throws(() { |
l13 = (f13 as dynamic); |
}); |
@@ -649,8 +628,8 @@ class U54<T> { |
l13 = confuse(f13); |
}); |
} |
- core.List<core.int> Function(int y, |
- {List<T> x}) Function<B extends core.int>() l13 = m13; |
+ core.List<core.int> Function(int y, {List<T> x}) |
+ Function<B extends core.int>() l13 = m13; |
// In checked mode, verifies the type. |
x13 = m13; |
x13 = confuse(m13); |
@@ -672,8 +651,8 @@ class U54<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function( |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m14 is List<T> Function([List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -688,7 +667,7 @@ class U54<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); |
}); |
@@ -742,7 +721,7 @@ class U54<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); |
}); |
@@ -805,8 +784,8 @@ class U54<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m17 is Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -856,8 +835,8 @@ class U54<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m19 is void Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -905,8 +884,8 @@ class U54<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is core.List<core.int> Function<A>( |
- A x) Function<B extends core.int>()); |
+ Expect.isTrue(m21 is core.List<core.int> Function<A>(A x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |