Index: tests/language/function_type/function_type86_test.dart |
diff --git a/tests/language/function_type/function_type86_test.dart b/tests/language/function_type/function_type86_test.dart |
index 33ee3cd4ed104bc4b8c02db522cc565962597e26..e32c96343b76ceff69c9b662961902762b7b89ee 100644 |
--- a/tests/language/function_type/function_type86_test.dart |
+++ b/tests/language/function_type/function_type86_test.dart |
@@ -19,63 +19,37 @@ 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({List<Function> x}); |
-typedef F1<T> |
- = core.List<core.int> Function(int x, [Function x2]); |
-typedef F2<T> |
- = Function(int x1, [int x2]); |
-typedef F3<T> |
- = void Function(int x1, [List<T> x2]); |
-typedef F4<T> |
- = int Function([int x1]) Function<B extends core.int>(); |
-typedef F5<T> |
- = int Function({List<Function> x}) Function<B extends core.int>(); |
-typedef F6<T> |
- = int Function() Function<B extends core.int>(); |
-typedef F7<T> |
- = Function Function(int x1, |
- [List<Function> x]) Function<B extends core.int>(); |
-typedef F8<T> |
- = Function Function([List<T> x1]) Function<B extends core.int>(); |
-typedef F9<T> |
- = List<Function> Function(int x, |
- [Function x1]) Function<B extends core.int>(); |
-typedef F10<T> |
- = List<Function> Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>(); |
-typedef F11<T> |
- = core.List<core.int> Function([Function x]) Function<B extends core.int>(); |
-typedef F12<T> |
- = core.List<core.int> Function( |
- core.List<core.int> x1) Function<B extends core.int>(); |
-typedef F13<T> |
- = List<T> Function(int x2, [int x3]) Function<B extends core.int>(); |
-typedef F14<T> |
- = List<T> Function(int x1, |
- {List<Function> x}) Function<B extends core.int>(); |
-typedef F15<T> |
- = Function(int x) Function<B extends core.int>(); |
-typedef F16<T> |
- = Function(int y, [List<Function> x]) Function<B extends core.int>(); |
-typedef F17<T> |
- = Function(int x2, [List<T> x3]) Function<B extends core.int>(); |
-typedef F18<T> |
- = void Function({Function x}) Function<B extends core.int>(); |
-typedef F19<T> |
- = void Function(List<T> x) Function<B extends core.int>(); |
-typedef F20<T> |
- = Function Function<A>() Function<B extends core.int>(); |
-typedef F21<T> |
- = List<T> Function<A>(A x) Function<B extends core.int>(); |
-typedef F22<T> |
- = List<A> Function<A>(List<A> x) Function<B extends core.int>(); |
+typedef F0<T> = Function Function({List<Function> x}); |
+typedef F1<T> = core.List<core.int> Function(int x, [Function x2]); |
+typedef F2<T> = Function(int x1, [int x2]); |
+typedef F3<T> = void Function(int x1, [List<T> x2]); |
+typedef F4<T> = int Function([int x1]) Function<B extends core.int>(); |
+typedef F5<T> = int Function({List<Function> x}) Function<B extends core.int>(); |
+typedef F6<T> = int Function() Function<B extends core.int>(); |
+typedef F7<T> = Function Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>(); |
+typedef F8<T> = Function Function([List<T> x1]) Function<B extends core.int>(); |
+typedef F9<T> = List<Function> Function(int x, [Function x1]) |
+ Function<B extends core.int>(); |
+typedef F10<T> = List<Function> Function(int y, {core.List<core.int> x}) |
+ Function<B extends core.int>(); |
+typedef F11<T> = core.List<core.int> Function([Function x]) |
+ Function<B extends core.int>(); |
+typedef F12<T> = core.List<core.int> Function(core.List<core.int> x1) |
+ Function<B extends core.int>(); |
+typedef F13<T> = List<T> Function(int x2, [int x3]) |
+ Function<B extends core.int>(); |
+typedef F14<T> = List<T> Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>(); |
+typedef F15<T> = Function(int x) Function<B extends core.int>(); |
+typedef F16<T> = Function(int y, [List<Function> x]) |
+ Function<B extends core.int>(); |
+typedef F17<T> = Function(int x2, [List<T> x3]) Function<B extends core.int>(); |
+typedef F18<T> = void Function({Function x}) Function<B extends core.int>(); |
+typedef F19<T> = void Function(List<T> x) Function<B extends core.int>(); |
+typedef F20<T> = Function Function<A>() Function<B extends core.int>(); |
+typedef F21<T> = List<T> Function<A>(A x) Function<B extends core.int>(); |
+typedef F22<T> = List<A> Function<A>(List<A> x) Function<B extends core.int>(); |
Function f0({List<Function> x}) => null; |
core.List<core.int> f1(int x, [Function x0]) => null; |
@@ -121,11 +95,11 @@ class U86<T> { |
Function Function([List<T> x1]) Function<B extends core.int>() x8; |
List<Function> Function(int x, [Function x1]) Function<B extends core.int>() |
x9; |
- List<Function> Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>() x10; |
+ List<Function> Function(int y, {core.List<core.int> x}) |
+ Function<B extends core.int>() x10; |
core.List<core.int> Function([Function x]) Function<B extends core.int>() x11; |
- core.List<core.int> Function( |
- core.List<core.int> x1) Function<B extends core.int>() x12; |
+ core.List<core.int> Function(core.List<core.int> x1) |
+ Function<B extends core.int>() x12; |
List<T> Function(int x2, [int x3]) Function<B extends core.int>() x13; |
List<T> Function(int x1, {List<Function> x}) Function<B extends core.int>() |
x14; |
@@ -298,7 +272,7 @@ class U86<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); |
}); |
@@ -409,8 +383,8 @@ class U86<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function(int x1, |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m7 is Function Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -450,7 +424,7 @@ class U86<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); |
}); |
@@ -488,8 +462,8 @@ class U86<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function(int x, |
- [Function x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m9 is List<Function> Function(int x, [Function x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -503,8 +477,8 @@ class U86<T> { |
Expect.isTrue(f10 is F10); |
Expect.isTrue(confuse(f10) is F10); |
// In checked mode, verifies the type. |
- List<Function> Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>() l10; |
+ List<Function> Function(int y, {core.List<core.int> x}) |
+ Function<B extends core.int>() l10; |
// The static function f10 sets `T` to `int`. |
if (!tIsBool) { |
x10 = f10 as dynamic; |
@@ -514,8 +488,8 @@ class U86<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m10 is List<Function> Function(int y, {core.List<core.int> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -540,8 +514,8 @@ class U86<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is core.List<core.int> Function( |
- [Function x]) Function<B extends core.int>()); |
+ Expect.isTrue(m11 is core.List<core.int> Function([Function x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -555,8 +529,8 @@ class U86<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> x1) Function<B extends core.int>() l12; |
+ core.List<core.int> Function(core.List<core.int> x1) |
+ Function<B extends core.int>() l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -566,8 +540,8 @@ class U86<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function( |
- core.List<core.int> x1) Function<B extends core.int>()); |
+ Expect.isTrue(m12 is core.List<core.int> Function(core.List<core.int> x1) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -591,8 +565,8 @@ class U86<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is List<T> Function(int x2, |
- [int x3]) Function<B extends core.int>()); |
+ Expect.isTrue(m13 is List<T> Function(int x2, [int x3]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -607,7 +581,7 @@ class U86<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); |
}); |
@@ -646,8 +620,8 @@ class U86<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function(int x1, |
- {List<Function> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m14 is List<T> Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -662,15 +636,15 @@ class U86<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); |
}); |
Expect.throws(() { |
x14 = confuse(f14); |
}); |
- List<T> Function(int x1, |
- {List<Function> x}) Function<B extends core.int>() l14; |
+ List<T> Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>() l14; |
Expect.throws(() { |
l14 = (f14 as dynamic); |
}); |
@@ -678,8 +652,8 @@ class U86<T> { |
l14 = confuse(f14); |
}); |
} |
- List<T> Function(int x1, |
- {List<Function> x}) Function<B extends core.int>() l14 = m14; |
+ List<T> Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>() l14 = m14; |
// In checked mode, verifies the type. |
x14 = m14; |
x14 = confuse(m14); |
@@ -725,8 +699,8 @@ class U86<T> { |
} |
Expect.isTrue(m16 is F16); |
- Expect.isTrue(m16 is Function(int y, |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m16 is Function(int y, [List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m16) is F16); |
// In checked mode, verifies the type. |
x16 = m16; |
@@ -766,7 +740,7 @@ class U86<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); |
}); |
@@ -844,7 +818,7 @@ class U86<T> { |
Expect.equals(tIsDynamic, m19 is F19<bool>); |
Expect.equals(tIsDynamic, confuse(m19) is F19<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x19 = (f19 as dynamic); |
}); |
@@ -921,7 +895,7 @@ class U86<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); |
}); |