Index: tests/language/function_type/function_type14_test.dart |
diff --git a/tests/language/function_type/function_type14_test.dart b/tests/language/function_type/function_type14_test.dart |
index 09bbc24fffa22e067c5712bacd473ad85683ebcc..593a2a015bcc1997ea971eb0e24c4bc0aa837950 100644 |
--- a/tests/language/function_type/function_type14_test.dart |
+++ b/tests/language/function_type/function_type14_test.dart |
@@ -19,63 +19,43 @@ 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, [Function x]); |
-typedef F1<T> |
- = List<Function> Function(int x0, [int x]); |
-typedef F2<T> |
- = core.List<core.int> Function(int x0, [List<T> x]); |
-typedef F3<T> |
- = Function([core.List<core.int> x]); |
-typedef F4<T> |
- = List<Function> Function<A>(A x); |
-typedef F5<T> |
- = int Function([Function x]) Function<B extends core.int>(); |
-typedef F6<T> |
- = int Function(core.List<core.int> x1) Function<B extends core.int>(); |
-typedef F7<T> |
- = Function Function(int x2, [int x3]) Function<B extends core.int>(); |
-typedef F8<T> |
- = Function Function(int x1, |
- {List<Function> x}) Function<B extends core.int>(); |
-typedef F9<T> |
- = List<Function> Function(int x) Function<B extends core.int>(); |
-typedef F10<T> |
- = List<Function> Function(int y, |
- [List<Function> x]) Function<B extends core.int>(); |
-typedef F11<T> |
- = List<Function> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>(); |
-typedef F12<T> |
- = core.List<core.int> Function({Function x}) Function<B extends core.int>(); |
-typedef F13<T> |
- = core.List<core.int> Function(List<T> x) Function<B extends core.int>(); |
-typedef F14<T> |
- = List<T> Function(int x1, [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 x, [int x1]) Function<B extends core.int>(); |
-typedef F17<T> |
- = Function(int y, {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(List<Function> x1) Function<B extends core.int>(); |
-typedef F20<T> |
- = void Function(int x, [List<T> x1]) Function<B extends core.int>(); |
-typedef F21<T> |
- = List<Function> Function<A>(List<T> x) Function<B extends core.int>(); |
-typedef F22<T> |
- = Function<A>() Function<B extends core.int>(); |
-typedef F23<T> |
- = void Function<A>(A x) Function<B extends core.int>(); |
+typedef F0<T> = int Function(int y, [Function x]); |
+typedef F1<T> = List<Function> Function(int x0, [int x]); |
+typedef F2<T> = core.List<core.int> Function(int x0, [List<T> x]); |
+typedef F3<T> = Function([core.List<core.int> x]); |
+typedef F4<T> = List<Function> Function<A>(A x); |
+typedef F5<T> = int Function([Function x]) Function<B extends core.int>(); |
+typedef F6<T> = int Function(core.List<core.int> x1) |
+ Function<B extends core.int>(); |
+typedef F7<T> = Function Function(int x2, [int x3]) |
+ Function<B extends core.int>(); |
+typedef F8<T> = Function Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>(); |
+typedef F9<T> = List<Function> Function(int x) Function<B extends core.int>(); |
+typedef F10<T> = List<Function> Function(int y, [List<Function> x]) |
+ Function<B extends core.int>(); |
+typedef F11<T> = List<Function> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>(); |
+typedef F12<T> = core.List<core.int> Function({Function x}) |
+ Function<B extends core.int>(); |
+typedef F13<T> = core.List<core.int> Function(List<T> x) |
+ Function<B extends core.int>(); |
+typedef F14<T> = List<T> Function(int x1, [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 x, [int x1]) Function<B extends core.int>(); |
+typedef F17<T> = Function(int y, {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(List<Function> x1) |
+ Function<B extends core.int>(); |
+typedef F20<T> = void Function(int x, [List<T> x1]) |
+ Function<B extends core.int>(); |
+typedef F21<T> = List<Function> Function<A>(List<T> x) |
+ Function<B extends core.int>(); |
+typedef F22<T> = Function<A>() Function<B extends core.int>(); |
+typedef F23<T> = void Function<A>(A x) Function<B extends core.int>(); |
int f0(int y, [Function x]) => null; |
List<Function> f1(int x0, [int x]) => null; |
@@ -120,8 +100,8 @@ class U14<T> { |
Function Function(int x1, {List<Function> x}) Function<B extends core.int>() |
x8; |
List<Function> Function(int x) Function<B extends core.int>() x9; |
- List<Function> Function(int y, |
- [List<Function> x]) Function<B extends core.int>() x10; |
+ List<Function> Function(int y, [List<Function> x]) |
+ Function<B extends core.int>() x10; |
List<Function> Function(int x2, [List<T> x3]) Function<B extends core.int>() |
x11; |
core.List<core.int> Function({Function x}) Function<B extends core.int>() x12; |
@@ -273,7 +253,7 @@ class U14<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); |
}); |
@@ -383,8 +363,8 @@ class U14<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is int Function( |
- core.List<core.int> x1) Function<B extends core.int>()); |
+ Expect.isTrue(m6 is int Function(core.List<core.int> x1) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m6) is F6); |
// In checked mode, verifies the type. |
x6 = m6; |
@@ -408,8 +388,8 @@ class U14<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function(int x2, |
- [int x3]) Function<B extends core.int>()); |
+ Expect.isTrue(m7 is Function Function(int x2, [int x3]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -434,8 +414,8 @@ class U14<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function(int x1, |
- {List<Function> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m8 is Function Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -474,8 +454,8 @@ class U14<T> { |
Expect.isTrue(f10 is F10); |
Expect.isTrue(confuse(f10) is F10); |
// In checked mode, verifies the type. |
- List<Function> Function(int y, |
- [List<Function> x]) Function<B extends core.int>() l10; |
+ List<Function> Function(int y, [List<Function> x]) |
+ Function<B extends core.int>() l10; |
// The static function f10 sets `T` to `int`. |
if (!tIsBool) { |
x10 = f10 as dynamic; |
@@ -485,8 +465,8 @@ class U14<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int y, |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m10 is List<Function> Function(int y, [List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -511,8 +491,8 @@ class U14<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is List<Function> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>()); |
+ Expect.isTrue(m11 is List<Function> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -527,15 +507,15 @@ class U14<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); |
}); |
Expect.throws(() { |
x11 = confuse(f11); |
}); |
- List<Function> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>() l11; |
+ List<Function> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>() l11; |
Expect.throws(() { |
l11 = (f11 as dynamic); |
}); |
@@ -543,8 +523,8 @@ class U14<T> { |
l11 = confuse(f11); |
}); |
} |
- List<Function> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>() l11 = m11; |
+ List<Function> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>() l11 = m11; |
// In checked mode, verifies the type. |
x11 = m11; |
x11 = confuse(m11); |
@@ -567,8 +547,8 @@ class U14<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function( |
- {Function x}) Function<B extends core.int>()); |
+ Expect.isTrue(m12 is core.List<core.int> Function({Function x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -592,8 +572,8 @@ class U14<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is core.List<core.int> Function( |
- List<T> x) Function<B extends core.int>()); |
+ Expect.isTrue(m13 is core.List<core.int> Function(List<T> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -608,7 +588,7 @@ class U14<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); |
}); |
@@ -647,8 +627,8 @@ class U14<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function(int x1, |
- [Function x]) Function<B extends core.int>()); |
+ Expect.isTrue(m14 is List<T> Function(int x1, [Function x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -663,7 +643,7 @@ class U14<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); |
}); |
@@ -703,8 +683,8 @@ class U14<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; |
@@ -719,15 +699,15 @@ class U14<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); |
}); |
Expect.throws(() { |
x15 = confuse(f15); |
}); |
- List<T> Function( |
- [core.List<core.int> x1]) Function<B extends core.int>() l15; |
+ List<T> Function([core.List<core.int> x1]) |
+ Function<B extends core.int>() l15; |
Expect.throws(() { |
l15 = (f15 as dynamic); |
}); |
@@ -783,8 +763,8 @@ class U14<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function(int y, |
- {List<Function> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m17 is Function(int y, {List<Function> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -857,8 +837,8 @@ class U14<T> { |
} |
Expect.isTrue(m20 is F20); |
- Expect.isTrue(m20 is void Function(int x, |
- [List<T> x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m20 is void Function(int x, [List<T> x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m20) is F20); |
// In checked mode, verifies the type. |
x20 = m20; |
@@ -873,7 +853,7 @@ class U14<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); |
}); |
@@ -911,8 +891,8 @@ class U14<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is List<Function> Function<A>( |
- List<T> x) Function<B extends core.int>()); |
+ Expect.isTrue(m21 is List<Function> Function<A>(List<T> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |
@@ -927,7 +907,7 @@ class U14<T> { |
Expect.equals(tIsDynamic, m21 is F21<bool>); |
Expect.equals(tIsDynamic, confuse(m21) is F21<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x21 = (f21 as dynamic); |
}); |