Index: tests/language/function_type/function_type71_test.dart |
diff --git a/tests/language/function_type/function_type71_test.dart b/tests/language/function_type/function_type71_test.dart |
index 7d1602d5e17f3c03a3b8ffa32d6cd131cb302657..613cfac4e212f83646239cb189ab0fc1d6adac47 100644 |
--- a/tests/language/function_type/function_type71_test.dart |
+++ b/tests/language/function_type/function_type71_test.dart |
@@ -19,64 +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> |
- = Function Function(Function x0); |
-typedef F1<T> |
- = core.List<core.int> Function(int y, [int x]); |
-typedef F2<T> |
- = List<T> Function(int y, [List<T> x]); |
-typedef F3<T> |
- = void Function(int x0, [core.List<core.int> x]); |
-typedef F4<T> |
- = int Function([int x]) Function<B extends core.int>(int x); |
-typedef F5<T> |
- = int Function(List<Function> x1) Function<B extends core.int>(int x); |
-typedef F6<T> |
- = int Function(int x, [List<T> x1]) Function<B extends core.int>(int x); |
-typedef F7<T> |
- = Function Function(int x1, {Function x}) 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 x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x); |
-typedef F11<T> |
- = core.List<core.int> Function({int x}) Function<B extends core.int>(int x); |
-typedef F12<T> |
- = core.List<core.int> Function( |
- core.List<core.int> x) 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([List<Function> x1]) Function<B extends core.int>(int x); |
-typedef F15<T> |
- = List<T> Function({List<T> x}) Function<B extends core.int>(int x); |
-typedef F16<T> |
- = Function(int y, {Function x}) 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(Function x1) Function<B extends core.int>(int x); |
-typedef F19<T> |
- = void Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>(int x); |
-typedef F20<T> |
- = Function Function<A>(Function x) Function<B extends core.int>(int x); |
-typedef F21<T> |
- = List<T> Function<A>(List<Function> x) Function<B extends core.int>(int x); |
-typedef F22<T> |
- = List<A> Function<A>(core.List<core.int> x) Function<B extends core.int>( |
- int x); |
+typedef F0<T> = Function Function(Function x0); |
+typedef F1<T> = core.List<core.int> Function(int y, [int x]); |
+typedef F2<T> = List<T> Function(int y, [List<T> x]); |
+typedef F3<T> = void Function(int x0, [core.List<core.int> x]); |
+typedef F4<T> = int Function([int x]) Function<B extends core.int>(int x); |
+typedef F5<T> = int Function(List<Function> x1) Function<B extends core.int>( |
+ int x); |
+typedef F6<T> = int Function(int x, [List<T> x1]) Function<B extends core.int>( |
+ int x); |
+typedef F7<T> = Function Function(int x1, {Function x}) |
+ 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 x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x); |
+typedef F11<T> = core.List<core.int> Function({int x}) |
+ Function<B extends core.int>(int x); |
+typedef F12<T> = core.List<core.int> Function(core.List<core.int> x) |
+ 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([List<Function> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F15<T> = List<T> Function({List<T> x}) Function<B extends core.int>( |
+ int x); |
+typedef F16<T> = Function(int y, {Function x}) 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(Function x1) Function<B extends core.int>(int x); |
+typedef F19<T> = void Function(int x, [core.List<core.int> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F20<T> = Function Function<A>(Function x) Function<B extends core.int>( |
+ int x); |
+typedef F21<T> = List<T> Function<A>(List<Function> x) |
+ Function<B extends core.int>(int x); |
+typedef F22<T> = List<A> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>(int x); |
Function f0(Function x0) => null; |
core.List<core.int> f1(int y, [int x]) => null; |
@@ -125,11 +107,11 @@ class U71<T> { |
Function Function([List<T> x]) Function<B extends core.int>(int x) x8; |
List<Function> Function(int y, [Function x]) Function<B extends core.int>( |
int x) x9; |
- List<Function> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) x10; |
+ List<Function> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) x10; |
core.List<core.int> Function({int x}) Function<B extends core.int>(int x) x11; |
- core.List<core.int> Function( |
- core.List<core.int> x) Function<B extends core.int>(int x) x12; |
+ core.List<core.int> Function(core.List<core.int> x) |
+ 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([List<Function> x1]) Function<B extends core.int>(int x) x14; |
List<T> Function({List<T> x}) Function<B extends core.int>(int x) x15; |
@@ -281,7 +263,7 @@ class U71<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); |
}); |
@@ -367,8 +349,8 @@ class U71<T> { |
} |
Expect.isTrue(m5 is F5); |
- Expect.isTrue(m5 is int Function( |
- List<Function> x1) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m5 is int Function(List<Function> x1) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m5) is F5); |
// In checked mode, verifies the type. |
x5 = m5; |
@@ -392,8 +374,8 @@ class U71<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is int Function(int x, |
- [List<T> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m6 is int Function(int x, [List<T> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m6) is F6); |
// In checked mode, verifies the type. |
x6 = m6; |
@@ -408,7 +390,7 @@ class U71<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); |
}); |
@@ -448,8 +430,8 @@ class U71<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function(int x1, |
- {Function x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m7 is Function Function(int x1, {Function x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -473,8 +455,8 @@ class U71<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; |
@@ -489,7 +471,7 @@ class U71<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); |
}); |
@@ -528,8 +510,8 @@ class U71<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; |
@@ -543,8 +525,8 @@ class U71<T> { |
Expect.isTrue(f10 is F10); |
Expect.isTrue(confuse(f10) is F10); |
// In checked mode, verifies the type. |
- List<Function> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) l10; |
+ List<Function> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) l10; |
// The static function f10 sets `T` to `int`. |
if (!tIsBool) { |
x10 = f10 as dynamic; |
@@ -555,7 +537,8 @@ class U71<T> { |
Expect.isTrue(m10 is F10); |
Expect.isTrue(m10 is List<Function> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x)); |
+ [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -580,8 +563,8 @@ class U71<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is core.List<core.int> Function( |
- {int x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m11 is core.List<core.int> Function({int x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -595,8 +578,8 @@ class U71<T> { |
Expect.isTrue(f12 is F12); |
Expect.isTrue(confuse(f12) is F12); |
// In checked mode, verifies the type. |
- core.List<core.int> Function( |
- core.List<core.int> x) Function<B extends core.int>(int x) l12; |
+ core.List<core.int> Function(core.List<core.int> x) |
+ Function<B extends core.int>(int x) l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -606,8 +589,8 @@ class U71<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function( |
- core.List<core.int> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m12 is core.List<core.int> Function(core.List<core.int> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -631,8 +614,8 @@ class U71<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; |
@@ -647,7 +630,7 @@ class U71<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); |
}); |
@@ -687,8 +670,8 @@ class U71<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function( |
- [List<Function> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m14 is List<T> Function([List<Function> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -703,7 +686,7 @@ class U71<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); |
}); |
@@ -742,8 +725,8 @@ class U71<T> { |
} |
Expect.isTrue(m15 is F15); |
- Expect.isTrue(m15 is List<T> Function( |
- {List<T> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m15 is List<T> Function({List<T> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m15) is F15); |
// In checked mode, verifies the type. |
x15 = m15; |
@@ -758,7 +741,7 @@ class U71<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); |
}); |
@@ -796,8 +779,8 @@ class U71<T> { |
} |
Expect.isTrue(m16 is F16); |
- Expect.isTrue(m16 is Function(int y, |
- {Function x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m16 is Function(int y, {Function x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m16) is F16); |
// In checked mode, verifies the type. |
x16 = m16; |
@@ -821,8 +804,8 @@ class U71<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; |
@@ -837,7 +820,7 @@ class U71<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); |
}); |
@@ -901,8 +884,8 @@ class U71<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m19 is void Function(int x, [core.List<core.int> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -926,8 +909,8 @@ class U71<T> { |
} |
Expect.isTrue(m20 is F20); |
- Expect.isTrue(m20 is Function Function<A>( |
- Function x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m20 is Function Function<A>(Function x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m20) is F20); |
// In checked mode, verifies the type. |
x20 = m20; |
@@ -952,8 +935,8 @@ class U71<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is List<T> Function<A>( |
- List<Function> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m21 is List<T> Function<A>(List<Function> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |
@@ -968,7 +951,7 @@ class U71<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); |
}); |
@@ -1008,8 +991,8 @@ class U71<T> { |
} |
Expect.isTrue(m22 is F22); |
- Expect.isTrue(m22 is List<A> Function<A>( |
- core.List<core.int> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m22 is List<A> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m22) is F22); |
// In checked mode, verifies the type. |
x22 = m22; |