Index: tests/language/function_type/function_type19_test.dart |
diff --git a/tests/language/function_type/function_type19_test.dart b/tests/language/function_type/function_type19_test.dart |
index a9c9a128b358787537f062afe9651944d0e6714b..42d317c19b481eb936713c98ac1af81aa6d8c825 100644 |
--- a/tests/language/function_type/function_type19_test.dart |
+++ b/tests/language/function_type/function_type19_test.dart |
@@ -19,67 +19,46 @@ 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({Function x}); |
-typedef F1<T> |
- = List<Function> Function(int x, [int x2]); |
-typedef F2<T> |
- = core.List<core.int> Function(int x, [List<T> x2]); |
-typedef F3<T> |
- = Function(int x1, [core.List<core.int> x2]); |
-typedef F4<T> |
- = core.List<core.int> Function<A>(core.List<core.int> x); |
-typedef F5<T> |
- = int Function(int x1, [Function x]) Function<B extends core.int>(int x); |
-typedef F6<T> |
- = int Function([core.List<core.int> x1]) Function<B extends core.int>( |
- int x); |
-typedef F7<T> |
- = Function Function(int x, [int x1]) Function<B extends core.int>(int x); |
-typedef F8<T> |
- = Function Function(int y, {List<Function> x}) 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(List<Function> x1) Function<B extends core.int>( |
- int x); |
-typedef F11<T> |
- = List<Function> Function(int x, [List<T> x1]) Function<B extends core.int>( |
- int x); |
-typedef F12<T> |
- = core.List<core.int> Function(int x1, |
- {Function x}) 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 x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x); |
-typedef F16<T> |
- = Function({int x}) Function<B extends core.int>(int x); |
-typedef F17<T> |
- = Function(core.List<core.int> x) 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([List<Function> x1]) Function<B extends core.int>(int x); |
-typedef F20<T> |
- = void Function({List<T> x}) Function<B extends core.int>(int x); |
-typedef F21<T> |
- = List<Function> Function<A>() Function<B extends core.int>(int x); |
-typedef F22<T> |
- = Function<A>(A x) Function<B extends core.int>(int x); |
-typedef F23<T> |
- = void Function<A>(List<A> x) Function<B extends core.int>(int x); |
+typedef F0<T> = int Function({Function x}); |
+typedef F1<T> = List<Function> Function(int x, [int x2]); |
+typedef F2<T> = core.List<core.int> Function(int x, [List<T> x2]); |
+typedef F3<T> = Function(int x1, [core.List<core.int> x2]); |
+typedef F4<T> = core.List<core.int> Function<A>(core.List<core.int> x); |
+typedef F5<T> = int Function(int x1, [Function x]) Function<B extends core.int>( |
+ int x); |
+typedef F6<T> = int Function([core.List<core.int> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F7<T> = Function Function(int x, [int x1]) Function<B extends core.int>( |
+ int x); |
+typedef F8<T> = Function Function(int y, {List<Function> x}) |
+ 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(List<Function> x1) |
+ Function<B extends core.int>(int x); |
+typedef F11<T> = List<Function> Function(int x, [List<T> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F12<T> = core.List<core.int> Function(int x1, {Function x}) |
+ 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 x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x); |
+typedef F16<T> = Function({int x}) Function<B extends core.int>(int x); |
+typedef F17<T> = Function(core.List<core.int> x) 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([List<Function> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F20<T> = void Function({List<T> x}) Function<B extends core.int>(int x); |
+typedef F21<T> = List<Function> Function<A>() Function<B extends core.int>( |
+ int x); |
+typedef F22<T> = Function<A>(A x) Function<B extends core.int>(int x); |
+typedef F23<T> = void Function<A>(List<A> x) Function<B extends core.int>( |
+ int x); |
int f0({Function x}) => null; |
List<Function> f1(int x, [int x0]) => null; |
@@ -134,13 +113,13 @@ class U19<T> { |
x10; |
List<Function> Function(int x, [List<T> x1]) Function<B extends core.int>( |
int x) x11; |
- core.List<core.int> Function(int x1, |
- {Function x}) Function<B extends core.int>(int x) x12; |
+ core.List<core.int> Function(int x1, {Function x}) |
+ 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; |
- List<T> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) x15; |
+ List<T> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) x15; |
Function({int x}) Function<B extends core.int>(int x) x16; |
Function(core.List<core.int> x) Function<B extends core.int>(int x) x17; |
void Function(int x1, [int x]) Function<B extends core.int>(int x) x18; |
@@ -291,7 +270,7 @@ class U19<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); |
}); |
@@ -376,8 +355,8 @@ class U19<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; |
@@ -402,8 +381,8 @@ class U19<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is int Function( |
- [core.List<core.int> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m6 is int Function([core.List<core.int> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m6) is F6); |
// In checked mode, verifies the type. |
x6 = m6; |
@@ -427,8 +406,8 @@ class U19<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function(int x, |
- [int x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m7 is Function Function(int x, [int x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -453,8 +432,8 @@ class U19<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function(int y, |
- {List<Function> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m8 is Function Function(int y, {List<Function> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -478,8 +457,8 @@ class U19<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; |
@@ -504,8 +483,8 @@ class U19<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function( |
- List<Function> x1) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m10 is List<Function> Function(List<Function> x1) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -530,8 +509,8 @@ class U19<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is List<Function> Function(int x, |
- [List<T> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m11 is List<Function> Function(int x, [List<T> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -546,15 +525,15 @@ class U19<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 x, |
- [List<T> x1]) Function<B extends core.int>(int x) l11; |
+ List<Function> Function(int x, [List<T> x1]) |
+ Function<B extends core.int>(int x) l11; |
Expect.throws(() { |
l11 = (f11 as dynamic); |
}); |
@@ -575,8 +554,8 @@ class U19<T> { |
Expect.isTrue(f12 is F12); |
Expect.isTrue(confuse(f12) is F12); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int x1, |
- {Function x}) Function<B extends core.int>(int x) l12; |
+ core.List<core.int> Function(int x1, {Function x}) |
+ Function<B extends core.int>(int x) l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -586,8 +565,8 @@ class U19<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function(int x1, |
- {Function x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m12 is core.List<core.int> Function(int x1, {Function x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -612,8 +591,8 @@ class U19<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; |
@@ -628,7 +607,7 @@ class U19<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); |
}); |
@@ -668,8 +647,8 @@ class U19<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; |
@@ -684,7 +663,7 @@ class U19<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); |
}); |
@@ -713,8 +692,8 @@ class U19<T> { |
Expect.isTrue(f15 is F15); |
Expect.isTrue(confuse(f15) is F15); |
// In checked mode, verifies the type. |
- List<T> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) l15; |
+ List<T> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) l15; |
// The static function f15 sets `T` to `int`. |
if (!tIsBool) { |
x15 = f15 as dynamic; |
@@ -724,8 +703,8 @@ class U19<T> { |
} |
Expect.isTrue(m15 is F15); |
- Expect.isTrue(m15 is List<T> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m15 is List<T> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m15) is F15); |
// In checked mode, verifies the type. |
x15 = m15; |
@@ -740,15 +719,15 @@ class U19<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(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) l15; |
+ List<T> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) l15; |
Expect.throws(() { |
l15 = (f15 as dynamic); |
}); |
@@ -756,9 +735,8 @@ class U19<T> { |
l15 = confuse(f15); |
}); |
} |
- List<T> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) |
- l15 = m15; |
+ List<T> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) l15 = m15; |
// In checked mode, verifies the type. |
x15 = m15; |
x15 = confuse(m15); |
@@ -804,8 +782,8 @@ class U19<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function( |
- core.List<core.int> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m17 is Function(core.List<core.int> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -829,8 +807,8 @@ class U19<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; |
@@ -854,8 +832,8 @@ class U19<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function( |
- [List<Function> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m19 is void Function([List<Function> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -895,7 +873,7 @@ class U19<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); |
}); |
@@ -932,8 +910,8 @@ class U19<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 |
- is List<Function> Function<A>() Function<B extends core.int>(int x)); |
+ Expect.isTrue(m21 is List<Function> Function<A>() |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |