Index: tests/language/function_type/function_type31_test.dart |
diff --git a/tests/language/function_type/function_type31_test.dart b/tests/language/function_type/function_type31_test.dart |
index 4593cacc8c9710066c0c29c14162798fc2aad5b4..1357f8e168de2eef8bb104c7fdeeedf282fd0e0e 100644 |
--- a/tests/language/function_type/function_type31_test.dart |
+++ b/tests/language/function_type/function_type31_test.dart |
@@ -19,69 +19,43 @@ 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, {List<Function> x}); |
-typedef F1<T> |
- = List<Function> Function({Function x}); |
-typedef F2<T> |
- = List<T> Function(int x, [int x2]); |
-typedef F3<T> |
- = Function(int x, [List<T> x2]); |
-typedef F4<T> |
- = List<T> Function<A>(List<A> x); |
-typedef F5<T> |
- = int Function([Function x1]) Function<B extends core.int>(int x); |
-typedef F6<T> |
- = int Function({core.List<core.int> x}) Function<B extends core.int>(int x); |
-typedef F7<T> |
- = Function Function(int y, {int x}) Function<B extends core.int>(int x); |
-typedef F8<T> |
- = Function Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>(int x); |
-typedef F9<T> |
- = List<Function> Function(int x1) Function<B extends core.int>(int x); |
-typedef F10<T> |
- = List<Function> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>(int x); |
-typedef F11<T> |
- = List<Function> Function(int y, {List<T> x}) Function<B extends core.int>( |
- int x); |
-typedef F12<T> |
- = core.List<core.int> Function( |
- [List<Function> x]) Function<B extends core.int>(int x); |
-typedef F13<T> |
- = core.List<core.int> Function(List<T> x1) Function<B extends core.int>( |
- int x); |
-typedef F14<T> |
- = List<T> Function(int x2, [Function x3]) Function<B extends core.int>( |
- int x); |
-typedef F15<T> |
- = List<T> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>(int x); |
-typedef F16<T> |
- = Function(Function x) Function<B extends core.int>(int x); |
-typedef F17<T> |
- = Function(int y, [core.List<core.int> x]) Function<B extends core.int>( |
- int x); |
-typedef F18<T> |
- = void Function([int x1]) Function<B extends core.int>(int x); |
-typedef F19<T> |
- = void Function({List<Function> x}) Function<B extends core.int>(int x); |
-typedef F20<T> |
- = void Function() Function<B extends core.int>(int x); |
-typedef F21<T> |
- = core.List<core.int> Function<A>(int x) Function<B extends core.int>( |
- int x); |
-typedef F22<T> |
- = A Function<A>(Function x) Function<B extends core.int>(int x); |
-typedef F23<T> |
- = Function(B x) Function<B extends core.int>(int x); |
+typedef F0<T> = int Function(int x0, {List<Function> x}); |
+typedef F1<T> = List<Function> Function({Function x}); |
+typedef F2<T> = List<T> Function(int x, [int x2]); |
+typedef F3<T> = Function(int x, [List<T> x2]); |
+typedef F4<T> = List<T> Function<A>(List<A> x); |
+typedef F5<T> = int Function([Function x1]) Function<B extends core.int>(int x); |
+typedef F6<T> = int Function({core.List<core.int> x}) |
+ Function<B extends core.int>(int x); |
+typedef F7<T> = Function Function(int y, {int x}) Function<B extends core.int>( |
+ int x); |
+typedef F8<T> = Function Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>(int x); |
+typedef F9<T> = List<Function> Function(int x1) Function<B extends core.int>( |
+ int x); |
+typedef F10<T> = List<Function> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F11<T> = List<Function> Function(int y, {List<T> x}) |
+ Function<B extends core.int>(int x); |
+typedef F12<T> = core.List<core.int> Function([List<Function> x]) |
+ Function<B extends core.int>(int x); |
+typedef F13<T> = core.List<core.int> Function(List<T> x1) |
+ Function<B extends core.int>(int x); |
+typedef F14<T> = List<T> Function(int x2, [Function x3]) |
+ Function<B extends core.int>(int x); |
+typedef F15<T> = List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(int x); |
+typedef F16<T> = Function(Function x) Function<B extends core.int>(int x); |
+typedef F17<T> = Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>(int x); |
+typedef F18<T> = void Function([int x1]) Function<B extends core.int>(int x); |
+typedef F19<T> = void Function({List<Function> x}) Function<B extends core.int>( |
+ int x); |
+typedef F20<T> = void Function() Function<B extends core.int>(int x); |
+typedef F21<T> = core.List<core.int> Function<A>(int x) |
+ Function<B extends core.int>(int x); |
+typedef F22<T> = A Function<A>(Function x) Function<B extends core.int>(int x); |
+typedef F23<T> = Function(B x) Function<B extends core.int>(int x); |
int f0(int x0, {List<Function> x}) => null; |
List<Function> f1({Function x}) => null; |
@@ -132,11 +106,11 @@ class U31<T> { |
int Function([Function x1]) Function<B extends core.int>(int x) x5; |
int Function({core.List<core.int> x}) Function<B extends core.int>(int x) x6; |
Function Function(int y, {int x}) Function<B extends core.int>(int x) x7; |
- Function Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>(int x) x8; |
+ Function Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>(int x) x8; |
List<Function> Function(int x1) Function<B extends core.int>(int x) x9; |
- List<Function> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>(int x) x10; |
+ List<Function> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>(int x) x10; |
List<Function> Function(int y, {List<T> x}) Function<B extends core.int>( |
int x) x11; |
core.List<core.int> Function([List<Function> x]) Function<B extends core.int>( |
@@ -145,8 +119,8 @@ class U31<T> { |
x13; |
List<T> Function(int x2, [Function x3]) Function<B extends core.int>(int x) |
x14; |
- List<T> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>(int x) x15; |
+ List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(int x) x15; |
Function(Function x) Function<B extends core.int>(int x) x16; |
Function(int y, [core.List<core.int> x]) Function<B extends core.int>(int x) |
x17; |
@@ -303,7 +277,7 @@ class U31<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); |
}); |
@@ -355,7 +329,7 @@ class U31<T> { |
Expect.equals(tIsDynamic, m3 is F3<bool>); |
Expect.equals(tIsDynamic, confuse(m3) is F3<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x3 = (f3 as dynamic); |
}); |
@@ -407,7 +381,7 @@ class U31<T> { |
Expect.equals(tIsDynamic, m4 is F4<bool>); |
Expect.equals(tIsDynamic, confuse(m4) is F4<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x4 = (f4 as dynamic); |
}); |
@@ -470,8 +444,8 @@ class U31<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is int Function( |
- {core.List<core.int> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m6 is int Function({core.List<core.int> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m6) is F6); |
// In checked mode, verifies the type. |
x6 = m6; |
@@ -495,8 +469,8 @@ class U31<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function(int y, |
- {int x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m7 is Function Function(int y, {int x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -510,8 +484,8 @@ class U31<T> { |
Expect.isTrue(f8 is F8); |
Expect.isTrue(confuse(f8) is F8); |
// In checked mode, verifies the type. |
- Function Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>(int x) l8; |
+ Function Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>(int x) l8; |
// The static function f8 sets `T` to `int`. |
if (!tIsBool) { |
x8 = f8 as dynamic; |
@@ -521,8 +495,8 @@ class U31<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m8 is Function Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -546,8 +520,8 @@ class U31<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function( |
- int x1) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m9 is List<Function> Function(int x1) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -561,8 +535,8 @@ class U31<T> { |
Expect.isTrue(f10 is F10); |
Expect.isTrue(confuse(f10) is F10); |
// In checked mode, verifies the type. |
- List<Function> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>(int x) l10; |
+ List<Function> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>(int x) l10; |
// The static function f10 sets `T` to `int`. |
if (!tIsBool) { |
x10 = f10 as dynamic; |
@@ -572,8 +546,8 @@ class U31<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m10 is List<Function> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -598,8 +572,8 @@ class U31<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is List<Function> Function(int y, |
- {List<T> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m11 is List<Function> Function(int y, {List<T> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -614,15 +588,15 @@ class U31<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 y, |
- {List<T> x}) Function<B extends core.int>(int x) l11; |
+ List<Function> Function(int y, {List<T> x}) |
+ Function<B extends core.int>(int x) l11; |
Expect.throws(() { |
l11 = (f11 as dynamic); |
}); |
@@ -643,8 +617,8 @@ class U31<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> x]) Function<B extends core.int>(int x) l12; |
+ core.List<core.int> Function([List<Function> x]) |
+ Function<B extends core.int>(int x) l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -654,8 +628,8 @@ class U31<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function( |
- [List<Function> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m12 is core.List<core.int> Function([List<Function> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -680,8 +654,8 @@ class U31<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is core.List<core.int> Function( |
- List<T> x1) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m13 is core.List<core.int> Function(List<T> x1) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -696,7 +670,7 @@ class U31<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); |
}); |
@@ -736,8 +710,8 @@ class U31<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function(int x2, |
- [Function x3]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m14 is List<T> Function(int x2, [Function x3]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -752,7 +726,7 @@ class U31<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); |
}); |
@@ -781,8 +755,8 @@ class U31<T> { |
Expect.isTrue(f15 is F15); |
Expect.isTrue(confuse(f15) is F15); |
// In checked mode, verifies the type. |
- List<T> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>(int x) l15; |
+ List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(int x) l15; |
// The static function f15 sets `T` to `int`. |
if (!tIsBool) { |
x15 = f15 as dynamic; |
@@ -792,8 +766,8 @@ class U31<T> { |
} |
Expect.isTrue(m15 is F15); |
- Expect.isTrue(m15 is List<T> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m15 is List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m15) is F15); |
// In checked mode, verifies the type. |
x15 = m15; |
@@ -808,15 +782,15 @@ class U31<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 x1, |
- {core.List<core.int> x}) Function<B extends core.int>(int x) l15; |
+ List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(int x) l15; |
Expect.throws(() { |
l15 = (f15 as dynamic); |
}); |
@@ -824,9 +798,8 @@ class U31<T> { |
l15 = confuse(f15); |
}); |
} |
- List<T> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>(int x) l15 = |
- m15; |
+ List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(int x) l15 = m15; |
// In checked mode, verifies the type. |
x15 = m15; |
x15 = confuse(m15); |
@@ -874,8 +847,8 @@ class U31<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m17 is Function(int y, [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; |
@@ -924,8 +897,8 @@ class U31<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function( |
- {List<Function> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m19 is void Function({List<Function> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -974,8 +947,8 @@ class U31<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is core.List<core.int> Function<A>( |
- int x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m21 is core.List<core.int> Function<A>(int x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |