Index: tests/language/function_type/function_type42_test.dart |
diff --git a/tests/language/function_type/function_type42_test.dart b/tests/language/function_type/function_type42_test.dart |
index 348750f7d1e9a4e699b8597b3fadb1358c017745..2be520f2f5464096a145c86593905c5c91072739 100644 |
--- a/tests/language/function_type/function_type42_test.dart |
+++ b/tests/language/function_type/function_type42_test.dart |
@@ -19,65 +19,42 @@ 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 x0, {core.List<core.int> x}); |
-typedef F1<T> |
- = List<Function> Function({List<Function> x}); |
-typedef F2<T> |
- = List<T> Function(int x, [Function x2]); |
-typedef F3<T> |
- = void Function(int x1, [int x2]); |
-typedef F4<T> |
- = A Function<A>(List<Function> x); |
-typedef F5<T> |
- = int Function({Function x}) Function<B extends core.int>(); |
-typedef F6<T> |
- = int Function(List<T> x) Function<B extends core.int>(); |
-typedef F7<T> |
- = Function Function(int x1, [Function x]) Function<B extends core.int>(); |
-typedef F8<T> |
- = Function Function( |
- [core.List<core.int> x1]) Function<B extends core.int>(); |
-typedef F9<T> |
- = List<Function> Function(int x, [int x1]) Function<B extends core.int>(); |
-typedef F10<T> |
- = List<Function> Function(int y, |
- {List<Function> x}) Function<B extends core.int>(); |
-typedef F11<T> |
- = core.List<core.int> Function([int x]) Function<B extends core.int>(); |
-typedef F12<T> |
- = core.List<core.int> Function( |
- List<Function> x1) Function<B extends core.int>(); |
-typedef F13<T> |
- = core.List<core.int> Function(int x, |
- [List<T> x1]) 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([List<T> x]) Function<B extends core.int>(); |
-typedef F16<T> |
- = Function(int y, [Function x]) Function<B extends core.int>(); |
-typedef F17<T> |
- = Function(int x2, [core.List<core.int> x3]) Function<B extends core.int>(); |
-typedef F18<T> |
- = void Function({int x}) Function<B extends core.int>(); |
-typedef F19<T> |
- = void Function(core.List<core.int> x) Function<B extends core.int>(); |
-typedef F20<T> |
- = int Function<A>(List<Function> x) Function<B extends core.int>(); |
-typedef F21<T> |
- = core.List<core.int> Function<A>( |
- core.List<core.int> x) Function<B extends core.int>(); |
-typedef F22<T> |
- = A Function<A>(List<T> x) Function<B extends core.int>(); |
-typedef F23<T> |
- = B Function(List<Function> x) Function<B extends core.int>(); |
+typedef F0<T> = int Function(int x0, {core.List<core.int> x}); |
+typedef F1<T> = List<Function> Function({List<Function> x}); |
+typedef F2<T> = List<T> Function(int x, [Function x2]); |
+typedef F3<T> = void Function(int x1, [int x2]); |
+typedef F4<T> = A Function<A>(List<Function> x); |
+typedef F5<T> = int Function({Function x}) Function<B extends core.int>(); |
+typedef F6<T> = int Function(List<T> x) Function<B extends core.int>(); |
+typedef F7<T> = Function Function(int x1, [Function x]) |
+ Function<B extends core.int>(); |
+typedef F8<T> = Function Function([core.List<core.int> x1]) |
+ Function<B extends core.int>(); |
+typedef F9<T> = List<Function> Function(int x, [int x1]) |
+ Function<B extends core.int>(); |
+typedef F10<T> = List<Function> Function(int y, {List<Function> x}) |
+ Function<B extends core.int>(); |
+typedef F11<T> = core.List<core.int> Function([int x]) |
+ Function<B extends core.int>(); |
+typedef F12<T> = core.List<core.int> Function(List<Function> x1) |
+ Function<B extends core.int>(); |
+typedef F13<T> = core.List<core.int> Function(int x, [List<T> x1]) |
+ 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([List<T> x]) Function<B extends core.int>(); |
+typedef F16<T> = Function(int y, [Function x]) Function<B extends core.int>(); |
+typedef F17<T> = Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(); |
+typedef F18<T> = void Function({int x}) Function<B extends core.int>(); |
+typedef F19<T> = void Function(core.List<core.int> x) |
+ Function<B extends core.int>(); |
+typedef F20<T> = int Function<A>(List<Function> x) |
+ Function<B extends core.int>(); |
+typedef F21<T> = core.List<core.int> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>(); |
+typedef F22<T> = A Function<A>(List<T> x) Function<B extends core.int>(); |
+typedef F23<T> = B Function(List<Function> x) Function<B extends core.int>(); |
int f0(int x0, {core.List<core.int> x}) => null; |
List<Function> f1({List<Function> x}) => null; |
@@ -123,13 +100,13 @@ class U42<T> { |
Function Function(int x1, [Function x]) Function<B extends core.int>() x7; |
Function Function([core.List<core.int> x1]) Function<B extends core.int>() x8; |
List<Function> Function(int x, [int x1]) 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; |
core.List<core.int> Function([int x]) Function<B extends core.int>() x11; |
core.List<core.int> Function(List<Function> x1) Function<B extends core.int>() |
x12; |
- core.List<core.int> Function(int x, |
- [List<T> x1]) Function<B extends core.int>() x13; |
+ core.List<core.int> Function(int x, [List<T> x1]) |
+ Function<B extends core.int>() x13; |
List<T> Function(int x1, {Function x}) Function<B extends core.int>() x14; |
List<T> Function([List<T> x]) Function<B extends core.int>() x15; |
Function(int y, [Function x]) Function<B extends core.int>() x16; |
@@ -137,8 +114,8 @@ class U42<T> { |
void Function({int x}) Function<B extends core.int>() x18; |
void Function(core.List<core.int> x) Function<B extends core.int>() x19; |
int Function<A>(List<Function> x) Function<B extends core.int>() x20; |
- core.List<core.int> Function<A>( |
- core.List<core.int> x) Function<B extends core.int>() x21; |
+ core.List<core.int> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>() x21; |
A Function<A>(List<T> x) Function<B extends core.int>() x22; |
B Function(List<Function> x) Function<B extends core.int>() x23; |
@@ -279,7 +256,7 @@ class U42<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); |
}); |
@@ -404,7 +381,7 @@ class U42<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); |
}); |
@@ -441,8 +418,8 @@ class U42<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function(int x1, |
- [Function x]) Function<B extends core.int>()); |
+ Expect.isTrue(m7 is Function Function(int x1, [Function x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -467,8 +444,8 @@ class U42<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function( |
- [core.List<core.int> x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m8 is Function Function([core.List<core.int> x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -492,8 +469,8 @@ class U42<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function(int x, |
- [int x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m9 is List<Function> Function(int x, [int x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -507,8 +484,8 @@ class U42<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; |
@@ -518,8 +495,8 @@ class U42<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; |
@@ -543,8 +520,8 @@ class U42<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is core.List<core.int> Function( |
- [int x]) Function<B extends core.int>()); |
+ Expect.isTrue(m11 is core.List<core.int> Function([int x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -558,8 +535,8 @@ class U42<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>() l12; |
+ core.List<core.int> Function(List<Function> x1) |
+ Function<B extends core.int>() l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -569,8 +546,8 @@ class U42<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function( |
- List<Function> x1) Function<B extends core.int>()); |
+ Expect.isTrue(m12 is core.List<core.int> Function(List<Function> x1) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -584,8 +561,8 @@ class U42<T> { |
Expect.isTrue(f13 is F13); |
Expect.isTrue(confuse(f13) is F13); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int x, |
- [List<T> x1]) Function<B extends core.int>() l13; |
+ core.List<core.int> Function(int x, [List<T> x1]) |
+ Function<B extends core.int>() l13; |
// The static function f13 sets `T` to `int`. |
if (!tIsBool) { |
x13 = f13 as dynamic; |
@@ -595,8 +572,8 @@ class U42<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is core.List<core.int> Function(int x, |
- [List<T> x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m13 is core.List<core.int> Function(int x, [List<T> x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -611,15 +588,15 @@ class U42<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); |
}); |
Expect.throws(() { |
x13 = confuse(f13); |
}); |
- core.List<core.int> Function(int x, |
- [List<T> x1]) Function<B extends core.int>() l13; |
+ core.List<core.int> Function(int x, [List<T> x1]) |
+ Function<B extends core.int>() l13; |
Expect.throws(() { |
l13 = (f13 as dynamic); |
}); |
@@ -627,8 +604,8 @@ class U42<T> { |
l13 = confuse(f13); |
}); |
} |
- core.List<core.int> Function(int x, |
- [List<T> x1]) Function<B extends core.int>() l13 = m13; |
+ core.List<core.int> Function(int x, [List<T> x1]) |
+ Function<B extends core.int>() l13 = m13; |
// In checked mode, verifies the type. |
x13 = m13; |
x13 = confuse(m13); |
@@ -650,8 +627,8 @@ class U42<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; |
@@ -666,7 +643,7 @@ class U42<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); |
}); |
@@ -721,7 +698,7 @@ class U42<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); |
}); |
@@ -784,8 +761,8 @@ class U42<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>()); |
+ Expect.isTrue(m17 is Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -833,8 +810,8 @@ class U42<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function( |
- core.List<core.int> x) Function<B extends core.int>()); |
+ Expect.isTrue(m19 is void Function(core.List<core.int> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -858,8 +835,8 @@ class U42<T> { |
} |
Expect.isTrue(m20 is F20); |
- Expect.isTrue(m20 is int Function<A>( |
- List<Function> x) Function<B extends core.int>()); |
+ Expect.isTrue(m20 is int Function<A>(List<Function> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m20) is F20); |
// In checked mode, verifies the type. |
x20 = m20; |
@@ -873,8 +850,8 @@ class U42<T> { |
Expect.isTrue(f21 is F21); |
Expect.isTrue(confuse(f21) is F21); |
// In checked mode, verifies the type. |
- core.List<core.int> Function<A>( |
- core.List<core.int> x) Function<B extends core.int>() l21; |
+ core.List<core.int> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>() l21; |
// The static function f21 sets `T` to `int`. |
if (!tIsBool) { |
x21 = f21 as dynamic; |
@@ -884,8 +861,8 @@ class U42<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is core.List<core.int> Function<A>( |
- core.List<core.int> x) Function<B extends core.int>()); |
+ Expect.isTrue(m21 is core.List<core.int> Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |
@@ -925,7 +902,7 @@ class U42<T> { |
Expect.equals(tIsDynamic, m22 is F22<bool>); |
Expect.equals(tIsDynamic, confuse(m22) is F22<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x22 = (f22 as dynamic); |
}); |