Index: tests/language/function_type/function_type99_test.dart |
diff --git a/tests/language/function_type/function_type99_test.dart b/tests/language/function_type/function_type99_test.dart |
index 2935468c548594ec124ab07d0b67cbf2637ceaa1..722efd7aaf66ca7c2d48ebea706be1206b9e779c 100644 |
--- a/tests/language/function_type/function_type99_test.dart |
+++ b/tests/language/function_type/function_type99_test.dart |
@@ -19,64 +19,45 @@ 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 y, {core.List<core.int> x}); |
-typedef F1<T> |
- = core.List<core.int> Function(int x0, {List<Function> x}); |
-typedef F2<T> |
- = Function({Function x}); |
-typedef F3<T> |
- = int Function<A>(List<A> x); |
-typedef F4<T> |
- = int Function({int x}) Function<B extends core.int>(int x); |
-typedef F5<T> |
- = int Function(core.List<core.int> x) Function<B extends core.int>(int x); |
-typedef F6<T> |
- = Function Function(int x1, [int x]) Function<B extends core.int>(int x); |
-typedef F7<T> |
- = Function Function([List<Function> x1]) Function<B extends core.int>( |
- int x); |
-typedef F8<T> |
- = Function Function({List<T> x}) Function<B extends core.int>(int x); |
-typedef F9<T> |
- = List<Function> Function(int y, {Function x}) Function<B extends core.int>( |
- int x); |
-typedef F10<T> |
- = List<Function> Function(int x1, [List<T> x]) Function<B extends core.int>( |
- int x); |
-typedef F11<T> |
- = core.List<core.int> Function(Function x1) Function<B extends core.int>( |
- int x); |
-typedef F12<T> |
- = core.List<core.int> Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>(int x); |
-typedef F13<T> |
- = List<T> Function(int x1, {int x}) Function<B extends core.int>(int x); |
-typedef F14<T> |
- = List<T> Function([core.List<core.int> x]) Function<B extends core.int>( |
- int x); |
-typedef F15<T> |
- = Function(int y, [int x]) Function<B extends core.int>(int x); |
-typedef F16<T> |
- = Function(int x2, [List<Function> x3]) Function<B extends core.int>(int x); |
-typedef F17<T> |
- = Function(int x1, {List<T> x}) Function<B extends core.int>(int x); |
-typedef F18<T> |
- = void Function(List<Function> x) Function<B extends core.int>(int x); |
-typedef F19<T> |
- = void Function(int y, [List<T> x]) Function<B extends core.int>(int x); |
-typedef F20<T> |
- = List<Function> Function<A>(int x) Function<B extends core.int>(int x); |
-typedef F21<T> |
- = Function<A>(Function x) Function<B extends core.int>(int x); |
-typedef F22<T> |
- = void Function<A>(List<Function> x) Function<B extends core.int>(int x); |
+typedef F0<T> = Function Function(int y, {core.List<core.int> x}); |
+typedef F1<T> = core.List<core.int> Function(int x0, {List<Function> x}); |
+typedef F2<T> = Function({Function x}); |
+typedef F3<T> = int Function<A>(List<A> x); |
+typedef F4<T> = int Function({int x}) Function<B extends core.int>(int x); |
+typedef F5<T> = int Function(core.List<core.int> x) |
+ Function<B extends core.int>(int x); |
+typedef F6<T> = Function Function(int x1, [int x]) Function<B extends core.int>( |
+ int x); |
+typedef F7<T> = Function Function([List<Function> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F8<T> = Function Function({List<T> x}) Function<B extends core.int>( |
+ int x); |
+typedef F9<T> = List<Function> Function(int y, {Function x}) |
+ Function<B extends core.int>(int x); |
+typedef F10<T> = List<Function> Function(int x1, [List<T> x]) |
+ Function<B extends core.int>(int x); |
+typedef F11<T> = core.List<core.int> Function(Function x1) |
+ Function<B extends core.int>(int x); |
+typedef F12<T> = core.List<core.int> Function(int x, [core.List<core.int> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F13<T> = List<T> Function(int x1, {int x}) Function<B extends core.int>( |
+ int x); |
+typedef F14<T> = List<T> Function([core.List<core.int> x]) |
+ Function<B extends core.int>(int x); |
+typedef F15<T> = Function(int y, [int x]) Function<B extends core.int>(int x); |
+typedef F16<T> = Function(int x2, [List<Function> x3]) |
+ Function<B extends core.int>(int x); |
+typedef F17<T> = Function(int x1, {List<T> x}) Function<B extends core.int>( |
+ int x); |
+typedef F18<T> = void Function(List<Function> x) Function<B extends core.int>( |
+ int x); |
+typedef F19<T> = void Function(int y, [List<T> x]) Function<B extends core.int>( |
+ int x); |
+typedef F20<T> = List<Function> Function<A>(int x) Function<B extends core.int>( |
+ int x); |
+typedef F21<T> = Function<A>(Function x) Function<B extends core.int>(int x); |
+typedef F22<T> = void Function<A>(List<Function> x) |
+ Function<B extends core.int>(int x); |
Function f0(int y, {core.List<core.int> x}) => null; |
core.List<core.int> f1(int x0, {List<Function> x}) => null; |
@@ -127,8 +108,8 @@ class U99<T> { |
int x) x10; |
core.List<core.int> Function(Function x1) Function<B extends core.int>(int x) |
x11; |
- core.List<core.int> Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>(int x) x12; |
+ core.List<core.int> Function(int x, [core.List<core.int> x1]) |
+ Function<B extends core.int>(int x) x12; |
List<T> Function(int x1, {int x}) Function<B extends core.int>(int x) x13; |
List<T> Function([core.List<core.int> x]) Function<B extends core.int>(int x) |
x14; |
@@ -336,8 +317,8 @@ class U99<T> { |
} |
Expect.isTrue(m5 is F5); |
- Expect.isTrue(m5 is int Function( |
- core.List<core.int> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m5 is int Function(core.List<core.int> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m5) is F5); |
// In checked mode, verifies the type. |
x5 = m5; |
@@ -361,8 +342,8 @@ class U99<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is Function Function(int x1, |
- [int x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m6 is Function Function(int x1, [int x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m6) is F6); |
// In checked mode, verifies the type. |
x6 = m6; |
@@ -387,8 +368,8 @@ class U99<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function( |
- [List<Function> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m7 is Function Function([List<Function> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -412,8 +393,8 @@ class U99<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function( |
- {List<T> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m8 is Function Function({List<T> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -428,7 +409,7 @@ class U99<T> { |
Expect.equals(tIsDynamic, m8 is F8<bool>); |
Expect.equals(tIsDynamic, confuse(m8) is F8<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x8 = (f8 as dynamic); |
}); |
@@ -467,8 +448,8 @@ class U99<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function(int y, |
- {Function x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m9 is List<Function> Function(int y, {Function x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -493,8 +474,8 @@ class U99<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int x1, |
- [List<T> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m10 is List<Function> Function(int x1, [List<T> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -509,15 +490,15 @@ class U99<T> { |
Expect.equals(tIsDynamic, m10 is F10<bool>); |
Expect.equals(tIsDynamic, confuse(m10) is F10<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x10 = (f10 as dynamic); |
}); |
Expect.throws(() { |
x10 = confuse(f10); |
}); |
- List<Function> Function(int x1, |
- [List<T> x]) Function<B extends core.int>(int x) l10; |
+ List<Function> Function(int x1, [List<T> x]) |
+ Function<B extends core.int>(int x) l10; |
Expect.throws(() { |
l10 = (f10 as dynamic); |
}); |
@@ -549,8 +530,8 @@ class U99<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is core.List<core.int> Function( |
- Function x1) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m11 is core.List<core.int> Function(Function x1) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -564,8 +545,8 @@ class U99<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, |
- [core.List<core.int> x1]) Function<B extends core.int>(int x) l12; |
+ core.List<core.int> Function(int x, [core.List<core.int> x1]) |
+ Function<B extends core.int>(int x) l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -576,7 +557,8 @@ class U99<T> { |
Expect.isTrue(m12 is F12); |
Expect.isTrue(m12 is core.List<core.int> Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>(int x)); |
+ [core.List<core.int> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -600,8 +582,8 @@ class U99<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is List<T> Function(int x1, |
- {int x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m13 is List<T> Function(int x1, {int x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -616,7 +598,7 @@ class U99<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); |
}); |
@@ -656,8 +638,8 @@ class U99<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function( |
- [core.List<core.int> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m14 is List<T> Function([core.List<core.int> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -672,7 +654,7 @@ class U99<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); |
}); |
@@ -737,8 +719,8 @@ class U99<T> { |
} |
Expect.isTrue(m16 is F16); |
- Expect.isTrue(m16 is Function(int x2, |
- [List<Function> x3]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m16 is Function(int x2, [List<Function> x3]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m16) is F16); |
// In checked mode, verifies the type. |
x16 = m16; |
@@ -762,8 +744,8 @@ class U99<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function(int x1, |
- {List<T> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m17 is Function(int x1, {List<T> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -778,7 +760,7 @@ class U99<T> { |
Expect.equals(tIsDynamic, m17 is F17<bool>); |
Expect.equals(tIsDynamic, confuse(m17) is F17<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x17 = (f17 as dynamic); |
}); |
@@ -816,8 +798,8 @@ class U99<T> { |
} |
Expect.isTrue(m18 is F18); |
- Expect.isTrue(m18 is void Function( |
- List<Function> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m18 is void Function(List<Function> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m18) is F18); |
// In checked mode, verifies the type. |
x18 = m18; |
@@ -841,8 +823,8 @@ class U99<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function(int y, |
- [List<T> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m19 is void Function(int y, [List<T> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -857,7 +839,7 @@ class U99<T> { |
Expect.equals(tIsDynamic, m19 is F19<bool>); |
Expect.equals(tIsDynamic, confuse(m19) is F19<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x19 = (f19 as dynamic); |
}); |
@@ -896,8 +878,8 @@ class U99<T> { |
} |
Expect.isTrue(m20 is F20); |
- Expect.isTrue(m20 is List<Function> Function<A>( |
- int x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m20 is List<Function> Function<A>(int x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m20) is F20); |
// In checked mode, verifies the type. |
x20 = m20; |
@@ -946,8 +928,8 @@ class U99<T> { |
} |
Expect.isTrue(m22 is F22); |
- Expect.isTrue(m22 is void Function<A>( |
- List<Function> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m22 is void Function<A>(List<Function> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m22) is F22); |
// In checked mode, verifies the type. |
x22 = m22; |