Index: tests/language/function_type/function_type47_test.dart |
diff --git a/tests/language/function_type/function_type47_test.dart b/tests/language/function_type/function_type47_test.dart |
index c481d5b2488ddc5263d7bd05a36708994937125b..c86205abafac4186556ca2d9abb335403548dff3 100644 |
--- a/tests/language/function_type/function_type47_test.dart |
+++ b/tests/language/function_type/function_type47_test.dart |
@@ -19,70 +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> |
- = 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(Function x); |
-typedef F4<T> |
- = A Function<A>(List<A> x); |
-typedef F5<T> |
- = int Function(int x1, {Function x}) Function<B extends core.int>(int x); |
-typedef F6<T> |
- = int Function([List<T> x]) Function<B extends core.int>(int x); |
-typedef F7<T> |
- = Function Function(int y, [Function x]) Function<B extends core.int>( |
- int x); |
-typedef F8<T> |
- = Function Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x); |
-typedef F9<T> |
- = List<Function> Function({int x}) Function<B extends core.int>(int x); |
-typedef F10<T> |
- = List<Function> Function( |
- core.List<core.int> x) Function<B extends core.int>(int x); |
-typedef F11<T> |
- = core.List<core.int> Function(int x1, |
- [int x]) Function<B extends core.int>(int x); |
-typedef F12<T> |
- = core.List<core.int> Function( |
- [List<Function> x1]) Function<B extends core.int>(int x); |
-typedef F13<T> |
- = core.List<core.int> Function({List<T> x}) Function<B extends core.int>( |
- int x); |
-typedef F14<T> |
- = List<T> Function(int y, {Function x}) Function<B extends core.int>(int x); |
-typedef F15<T> |
- = List<T> Function(int x1, [List<T> x]) Function<B extends core.int>(int x); |
-typedef F16<T> |
- = Function(Function x1) Function<B extends core.int>(int x); |
-typedef F17<T> |
- = Function(int x, [core.List<core.int> x1]) Function<B extends core.int>( |
- int x); |
-typedef F18<T> |
- = void Function(int x1, {int x}) Function<B extends core.int>(int x); |
-typedef F19<T> |
- = void Function([core.List<core.int> x]) Function<B extends core.int>( |
- int x); |
-typedef F20<T> |
- = int Function<A>(core.List<core.int> x) Function<B extends core.int>( |
- int x); |
-typedef F21<T> |
- = core.List<core.int> Function<A>(List<T> x) Function<B extends core.int>( |
- int x); |
-typedef F22<T> |
- = A Function<A>() Function<B extends core.int>(int x); |
-typedef F23<T> |
- = B Function(List<T> x) Function<B extends core.int>(int x); |
+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(Function x); |
+typedef F4<T> = A Function<A>(List<A> x); |
+typedef F5<T> = int Function(int x1, {Function x}) Function<B extends core.int>( |
+ int x); |
+typedef F6<T> = int Function([List<T> x]) Function<B extends core.int>(int x); |
+typedef F7<T> = Function Function(int y, [Function x]) |
+ Function<B extends core.int>(int x); |
+typedef F8<T> = Function Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x); |
+typedef F9<T> = List<Function> Function({int x}) Function<B extends core.int>( |
+ int x); |
+typedef F10<T> = List<Function> Function(core.List<core.int> x) |
+ Function<B extends core.int>(int x); |
+typedef F11<T> = core.List<core.int> Function(int x1, [int x]) |
+ Function<B extends core.int>(int x); |
+typedef F12<T> = core.List<core.int> Function([List<Function> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F13<T> = core.List<core.int> Function({List<T> x}) |
+ Function<B extends core.int>(int x); |
+typedef F14<T> = List<T> Function(int y, {Function x}) |
+ Function<B extends core.int>(int x); |
+typedef F15<T> = List<T> Function(int x1, [List<T> x]) |
+ Function<B extends core.int>(int x); |
+typedef F16<T> = Function(Function x1) Function<B extends core.int>(int x); |
+typedef F17<T> = Function(int x, [core.List<core.int> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F18<T> = void Function(int x1, {int x}) Function<B extends core.int>( |
+ int x); |
+typedef F19<T> = void Function([core.List<core.int> x]) |
+ Function<B extends core.int>(int x); |
+typedef F20<T> = int Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>(int x); |
+typedef F21<T> = core.List<core.int> Function<A>(List<T> x) |
+ Function<B extends core.int>(int x); |
+typedef F22<T> = A Function<A>() Function<B extends core.int>(int x); |
+typedef F23<T> = B Function(List<T> x) Function<B extends core.int>(int x); |
int f0(int y, [List<int> x]) => null; |
List<Function> f1(int x0, [core.List<core.int> x]) => null; |
@@ -132,15 +107,15 @@ class U47<T> { |
int Function(int x1, {Function x}) Function<B extends core.int>(int x) x5; |
int Function([List<T> x]) Function<B extends core.int>(int x) x6; |
Function Function(int y, [Function x]) Function<B extends core.int>(int x) x7; |
- Function Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) x8; |
+ Function Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) x8; |
List<Function> Function({int x}) Function<B extends core.int>(int x) x9; |
List<Function> Function(core.List<core.int> x) Function<B extends core.int>( |
int x) x10; |
core.List<core.int> Function(int x1, [int x]) Function<B extends core.int>( |
int x) x11; |
- core.List<core.int> Function( |
- [List<Function> x1]) Function<B extends core.int>(int x) x12; |
+ core.List<core.int> Function([List<Function> x1]) |
+ Function<B extends core.int>(int x) x12; |
core.List<core.int> Function({List<T> x}) Function<B extends core.int>(int x) |
x13; |
List<T> Function(int y, {Function x}) Function<B extends core.int>(int x) x14; |
@@ -254,7 +229,7 @@ class U47<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); |
}); |
@@ -331,7 +306,7 @@ class U47<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); |
}); |
@@ -416,8 +391,8 @@ class U47<T> { |
} |
Expect.isTrue(m5 is F5); |
- Expect.isTrue(m5 is int Function(int x1, |
- {Function x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m5 is int Function(int x1, {Function x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m5) is F5); |
// In checked mode, verifies the type. |
x5 = m5; |
@@ -457,7 +432,7 @@ class U47<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); |
}); |
@@ -495,8 +470,8 @@ class U47<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function(int y, |
- [Function x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m7 is Function Function(int y, [Function x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -510,8 +485,8 @@ class U47<T> { |
Expect.isTrue(f8 is F8); |
Expect.isTrue(confuse(f8) is F8); |
// In checked mode, verifies the type. |
- Function Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) l8; |
+ Function Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) l8; |
// The static function f8 sets `T` to `int`. |
if (!tIsBool) { |
x8 = f8 as dynamic; |
@@ -521,8 +496,8 @@ class U47<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m8 is Function Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -546,8 +521,8 @@ class U47<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function( |
- {int x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m9 is List<Function> Function({int x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -572,8 +547,8 @@ class U47<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function( |
- core.List<core.int> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m10 is List<Function> Function(core.List<core.int> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -598,8 +573,8 @@ class U47<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is core.List<core.int> Function(int x1, |
- [int x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m11 is core.List<core.int> Function(int x1, [int x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -613,8 +588,8 @@ class U47<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> x1]) Function<B extends core.int>(int x) l12; |
+ core.List<core.int> Function([List<Function> x1]) |
+ Function<B extends core.int>(int x) l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -624,8 +599,8 @@ class U47<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function( |
- [List<Function> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m12 is core.List<core.int> Function([List<Function> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -650,8 +625,8 @@ class U47<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is core.List<core.int> Function( |
- {List<T> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m13 is core.List<core.int> Function({List<T> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -666,7 +641,7 @@ class U47<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); |
}); |
@@ -706,8 +681,8 @@ class U47<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function(int y, |
- {Function x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m14 is List<T> Function(int y, {Function x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -722,7 +697,7 @@ class U47<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); |
}); |
@@ -762,8 +737,8 @@ class U47<T> { |
} |
Expect.isTrue(m15 is F15); |
- Expect.isTrue(m15 is List<T> Function(int x1, |
- [List<T> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m15 is List<T> Function(int x1, [List<T> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m15) is F15); |
// In checked mode, verifies the type. |
x15 = m15; |
@@ -778,7 +753,7 @@ class U47<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); |
}); |
@@ -843,8 +818,8 @@ class U47<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m17 is Function(int x, [core.List<core.int> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -868,8 +843,8 @@ class U47<T> { |
} |
Expect.isTrue(m18 is F18); |
- Expect.isTrue(m18 is void Function(int x1, |
- {int x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m18 is void Function(int x1, {int x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m18) is F18); |
// In checked mode, verifies the type. |
x18 = m18; |
@@ -894,8 +869,8 @@ class U47<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function( |
- [core.List<core.int> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m19 is void Function([core.List<core.int> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -920,8 +895,8 @@ class U47<T> { |
} |
Expect.isTrue(m20 is F20); |
- Expect.isTrue(m20 is int Function<A>( |
- core.List<core.int> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m20 is int Function<A>(core.List<core.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 +921,8 @@ class U47<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is core.List<core.int> Function<A>( |
- List<T> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m21 is core.List<core.int> Function<A>(List<T> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |
@@ -962,7 +937,7 @@ class U47<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); |
}); |
@@ -1041,7 +1016,7 @@ class U47<T> { |
Expect.equals(tIsDynamic, m23 is F23<bool>); |
Expect.equals(tIsDynamic, confuse(m23) is F23<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x23 = (f23 as dynamic); |
}); |