Index: tests/language/function_type/function_type58_test.dart |
diff --git a/tests/language/function_type/function_type58_test.dart b/tests/language/function_type/function_type58_test.dart |
index b424acc74ebea485b32dedb8070d9dbbb390a7d4..4835c218d95756cf0caed27d811001a29fa51c16 100644 |
--- a/tests/language/function_type/function_type58_test.dart |
+++ b/tests/language/function_type/function_type58_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> |
- = Function Function(int x0, [int x]); |
-typedef F1<T> |
- = List<Function> Function(int x0, [List<T> x]); |
-typedef F2<T> |
- = List<T> Function([core.List<core.int> x]); |
-typedef F3<T> |
- = void Function(List<Function> x); |
-typedef F4<T> |
- = void Function<A>(List<Function> x); |
-typedef F5<T> |
- = int Function([List<Function> x]) Function<B extends core.int>(); |
-typedef F6<T> |
- = int Function(List<T> x1) Function<B extends core.int>(); |
-typedef F7<T> |
- = Function Function(int x2, [Function x3]) Function<B extends core.int>(); |
-typedef F8<T> |
- = Function Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>(); |
-typedef F9<T> |
- = List<Function> Function(Function x) Function<B extends core.int>(); |
-typedef F10<T> |
- = List<Function> Function(int y, |
- [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( |
- {List<Function> x}) Function<B extends core.int>(); |
-typedef F13<T> |
- = core.List<core.int> Function() Function<B extends core.int>(); |
-typedef F14<T> |
- = List<T> Function(int x1, |
- [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 x, [Function x1]) Function<B extends core.int>(); |
-typedef F17<T> |
- = Function(int y, {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(core.List<core.int> x1) Function<B extends core.int>(); |
-typedef F20<T> |
- = int Function<A>(A x) Function<B extends core.int>(); |
-typedef F21<T> |
- = core.List<core.int> Function<A>(List<A> x) Function<B extends core.int>(); |
-typedef F22<T> |
- = List<A> Function<A>(int x) Function<B extends core.int>(); |
+typedef F0<T> = Function Function(int x0, [int x]); |
+typedef F1<T> = List<Function> Function(int x0, [List<T> x]); |
+typedef F2<T> = List<T> Function([core.List<core.int> x]); |
+typedef F3<T> = void Function(List<Function> x); |
+typedef F4<T> = void Function<A>(List<Function> x); |
+typedef F5<T> = int Function([List<Function> x]) Function<B extends core.int>(); |
+typedef F6<T> = int Function(List<T> x1) Function<B extends core.int>(); |
+typedef F7<T> = Function Function(int x2, [Function x3]) |
+ Function<B extends core.int>(); |
+typedef F8<T> = Function Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(); |
+typedef F9<T> = List<Function> Function(Function x) |
+ Function<B extends core.int>(); |
+typedef F10<T> = List<Function> Function(int y, [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({List<Function> x}) |
+ Function<B extends core.int>(); |
+typedef F13<T> = core.List<core.int> Function() Function<B extends core.int>(); |
+typedef F14<T> = List<T> Function(int x1, [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 x, [Function x1]) Function<B extends core.int>(); |
+typedef F17<T> = Function(int y, {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(core.List<core.int> x1) |
+ Function<B extends core.int>(); |
+typedef F20<T> = int Function<A>(A x) Function<B extends core.int>(); |
+typedef F21<T> = core.List<core.int> Function<A>(List<A> x) |
+ Function<B extends core.int>(); |
+typedef F22<T> = List<A> Function<A>(int x) Function<B extends core.int>(); |
Function f0(int x0, [int x]) => null; |
List<Function> f1(int x0, [List<int> x]) => null; |
@@ -117,14 +94,14 @@ class U58<T> { |
int Function([List<Function> x]) Function<B extends core.int>() x5; |
int Function(List<T> x1) Function<B extends core.int>() x6; |
Function Function(int x2, [Function x3]) Function<B extends core.int>() x7; |
- Function Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>() x8; |
+ Function Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>() x8; |
List<Function> Function(Function x) Function<B extends core.int>() x9; |
- List<Function> Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>() x10; |
+ List<Function> Function(int y, [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( |
- {List<Function> x}) Function<B extends core.int>() x12; |
+ core.List<core.int> Function({List<Function> x}) |
+ Function<B extends core.int>() x12; |
core.List<core.int> Function() Function<B extends core.int>() x13; |
List<T> Function(int x1, [List<Function> x]) Function<B extends core.int>() |
x14; |
@@ -248,7 +225,7 @@ class U58<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); |
}); |
@@ -300,7 +277,7 @@ class U58<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 U58<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); |
}); |
@@ -463,8 +440,8 @@ class U58<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function(int x2, |
- [Function x3]) Function<B extends core.int>()); |
+ Expect.isTrue(m7 is Function Function(int x2, [Function x3]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -478,8 +455,8 @@ class U58<T> { |
Expect.isTrue(f8 is F8); |
Expect.isTrue(confuse(f8) is F8); |
// In checked mode, verifies the type. |
- Function Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>() l8; |
+ Function Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>() l8; |
// The static function f8 sets `T` to `int`. |
if (!tIsBool) { |
x8 = f8 as dynamic; |
@@ -489,8 +466,8 @@ class U58<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m8 is Function Function(int x1, {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 U58<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function( |
- Function x) Function<B extends core.int>()); |
+ Expect.isTrue(m9 is List<Function> Function(Function 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 U58<T> { |
Expect.isTrue(f10 is F10); |
Expect.isTrue(confuse(f10) is F10); |
// In checked mode, verifies the type. |
- List<Function> Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>() l10; |
+ List<Function> Function(int y, [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; |
@@ -540,8 +517,8 @@ class U58<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m10 is List<Function> Function(int y, [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 +542,8 @@ class U58<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 +557,8 @@ class U58<T> { |
Expect.isTrue(f12 is F12); |
Expect.isTrue(confuse(f12) is F12); |
// In checked mode, verifies the type. |
- core.List<core.int> Function( |
- {List<Function> x}) Function<B extends core.int>() l12; |
+ core.List<core.int> Function({List<Function> x}) |
+ Function<B extends core.int>() l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -591,8 +568,8 @@ class U58<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function( |
- {List<Function> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m12 is core.List<core.int> Function({List<Function> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -642,8 +619,8 @@ class U58<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function(int x1, |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m14 is List<T> Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -658,15 +635,15 @@ class U58<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); |
}); |
Expect.throws(() { |
x14 = confuse(f14); |
}); |
- List<T> Function(int x1, |
- [List<Function> x]) Function<B extends core.int>() l14; |
+ List<T> Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>() l14; |
Expect.throws(() { |
l14 = (f14 as dynamic); |
}); |
@@ -674,8 +651,8 @@ class U58<T> { |
l14 = confuse(f14); |
}); |
} |
- List<T> Function(int x1, |
- [List<Function> x]) Function<B extends core.int>() l14 = m14; |
+ List<T> Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>() l14 = m14; |
// In checked mode, verifies the type. |
x14 = m14; |
x14 = confuse(m14); |
@@ -713,7 +690,7 @@ class U58<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); |
}); |
@@ -775,8 +752,8 @@ class U58<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m17 is Function(int y, {core.List<core.int> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -825,8 +802,8 @@ class U58<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function( |
- core.List<core.int> x1) Function<B extends core.int>()); |
+ Expect.isTrue(m19 is void Function(core.List<core.int> x1) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -875,8 +852,8 @@ class U58<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is core.List<core.int> Function<A>( |
- List<A> x) Function<B extends core.int>()); |
+ Expect.isTrue(m21 is core.List<core.int> Function<A>(List<A> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |