Index: tests/language/function_type/function_type95_test.dart |
diff --git a/tests/language/function_type/function_type95_test.dart b/tests/language/function_type/function_type95_test.dart |
index 5844b7fa7769fda297a1335f8b11cfe14a008958..d52e33fe8cc59235a320631dabdffaf8fc66197b 100644 |
--- a/tests/language/function_type/function_type95_test.dart |
+++ b/tests/language/function_type/function_type95_test.dart |
@@ -19,64 +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> |
- = Function Function(int x1, [core.List<core.int> x2]); |
-typedef F1<T> |
- = core.List<core.int> Function([List<Function> x1]); |
-typedef F2<T> |
- = Function(Function x0); |
-typedef F3<T> |
- = int Function<A>(core.List<core.int> x); |
-typedef F4<T> |
- = int Function(int x, [int x1]) Function<B extends core.int>(int x); |
-typedef F5<T> |
- = int Function(int y, {List<Function> x}) Function<B extends core.int>( |
- int x); |
-typedef F6<T> |
- = Function Function([int x]) Function<B extends core.int>(int x); |
-typedef F7<T> |
- = Function Function(List<Function> x1) Function<B extends core.int>(int x); |
-typedef F8<T> |
- = Function Function(int x, [List<T> x1]) Function<B extends core.int>( |
- int x); |
-typedef F9<T> |
- = List<Function> Function(int x1, |
- {Function x}) Function<B extends core.int>(int x); |
-typedef F10<T> |
- = List<Function> Function([List<T> x]) Function<B extends core.int>(int x); |
-typedef F11<T> |
- = core.List<core.int> Function(int y, |
- [Function x]) Function<B extends core.int>(int x); |
-typedef F12<T> |
- = core.List<core.int> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x); |
-typedef F13<T> |
- = List<T> Function({int x}) Function<B extends core.int>(int x); |
-typedef F14<T> |
- = List<T> Function(core.List<core.int> x) Function<B extends core.int>( |
- int x); |
-typedef F15<T> |
- = Function(int x1, [int x]) Function<B extends core.int>(int x); |
-typedef F16<T> |
- = Function([List<Function> x1]) Function<B extends core.int>(int x); |
-typedef F17<T> |
- = Function({List<T> x}) Function<B extends core.int>(int x); |
-typedef F18<T> |
- = void Function(int y, {Function x}) Function<B extends core.int>(int x); |
-typedef F19<T> |
- = void Function(int x1, [List<T> x]) Function<B extends core.int>(int x); |
-typedef F20<T> |
- = Function Function<A>(List<A> x) Function<B extends core.int>(int x); |
-typedef F21<T> |
- = Function<A>(int x) Function<B extends core.int>(int x); |
-typedef F22<T> |
- = void Function<A>(Function x) Function<B extends core.int>(int x); |
+typedef F0<T> = Function Function(int x1, [core.List<core.int> x2]); |
+typedef F1<T> = core.List<core.int> Function([List<Function> x1]); |
+typedef F2<T> = Function(Function x0); |
+typedef F3<T> = int Function<A>(core.List<core.int> x); |
+typedef F4<T> = int Function(int x, [int x1]) Function<B extends core.int>( |
+ int x); |
+typedef F5<T> = int Function(int y, {List<Function> x}) |
+ Function<B extends core.int>(int x); |
+typedef F6<T> = Function Function([int x]) Function<B extends core.int>(int x); |
+typedef F7<T> = Function Function(List<Function> x1) |
+ Function<B extends core.int>(int x); |
+typedef F8<T> = Function Function(int x, [List<T> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F9<T> = List<Function> Function(int x1, {Function x}) |
+ Function<B extends core.int>(int x); |
+typedef F10<T> = List<Function> Function([List<T> x]) |
+ Function<B extends core.int>(int x); |
+typedef F11<T> = core.List<core.int> Function(int y, [Function x]) |
+ Function<B extends core.int>(int x); |
+typedef F12<T> = core.List<core.int> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x); |
+typedef F13<T> = List<T> Function({int x}) Function<B extends core.int>(int x); |
+typedef F14<T> = List<T> Function(core.List<core.int> x) |
+ Function<B extends core.int>(int x); |
+typedef F15<T> = Function(int x1, [int x]) Function<B extends core.int>(int x); |
+typedef F16<T> = Function([List<Function> x1]) Function<B extends core.int>( |
+ int x); |
+typedef F17<T> = Function({List<T> x}) Function<B extends core.int>(int x); |
+typedef F18<T> = void Function(int y, {Function x}) |
+ Function<B extends core.int>(int x); |
+typedef F19<T> = void Function(int x1, [List<T> x]) |
+ Function<B extends core.int>(int x); |
+typedef F20<T> = Function Function<A>(List<A> x) Function<B extends core.int>( |
+ int x); |
+typedef F21<T> = Function<A>(int x) Function<B extends core.int>(int x); |
+typedef F22<T> = void Function<A>(Function x) Function<B extends core.int>( |
+ int x); |
Function f0(int x0, [core.List<core.int> x1]) => null; |
core.List<core.int> f1([List<Function> x0]) => null; |
@@ -125,10 +104,10 @@ class U95<T> { |
List<Function> Function(int x1, {Function x}) Function<B extends core.int>( |
int x) x9; |
List<Function> Function([List<T> x]) Function<B extends core.int>(int x) x10; |
- core.List<core.int> Function(int y, |
- [Function x]) Function<B extends core.int>(int x) x11; |
- core.List<core.int> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) x12; |
+ core.List<core.int> Function(int y, [Function x]) |
+ Function<B extends core.int>(int x) x11; |
+ core.List<core.int> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) x12; |
List<T> Function({int x}) Function<B extends core.int>(int x) x13; |
List<T> Function(core.List<core.int> x) Function<B extends core.int>(int x) |
x14; |
@@ -310,8 +289,8 @@ class U95<T> { |
} |
Expect.isTrue(m4 is F4); |
- Expect.isTrue(m4 is int Function(int x, |
- [int x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m4 is int Function(int x, [int x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m4) is F4); |
// In checked mode, verifies the type. |
x4 = m4; |
@@ -336,8 +315,8 @@ class U95<T> { |
} |
Expect.isTrue(m5 is F5); |
- Expect.isTrue(m5 is int Function(int y, |
- {List<Function> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m5 is int Function(int y, {List<Function> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m5) is F5); |
// In checked mode, verifies the type. |
x5 = m5; |
@@ -386,8 +365,8 @@ class U95<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function( |
- List<Function> x1) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m7 is Function Function(List<Function> x1) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -412,8 +391,8 @@ class U95<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function(int x, |
- [List<T> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m8 is Function Function(int x, [List<T> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -428,7 +407,7 @@ class U95<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); |
}); |
@@ -468,8 +447,8 @@ class U95<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function(int x1, |
- {Function x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m9 is List<Function> Function(int x1, {Function x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -494,8 +473,8 @@ class U95<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function( |
- [List<T> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m10 is List<Function> Function([List<T> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -510,7 +489,7 @@ class U95<T> { |
Expect.equals(tIsDynamic, m10 is F10<bool>); |
Expect.equals(tIsDynamic, confuse(m10) is F10<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x10 = (f10 as dynamic); |
}); |
@@ -539,8 +518,8 @@ class U95<T> { |
Expect.isTrue(f11 is F11); |
Expect.isTrue(confuse(f11) is F11); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int y, |
- [Function x]) Function<B extends core.int>(int x) l11; |
+ core.List<core.int> Function(int y, [Function x]) |
+ Function<B extends core.int>(int x) l11; |
// The static function f11 sets `T` to `int`. |
if (!tIsBool) { |
x11 = f11 as dynamic; |
@@ -550,8 +529,8 @@ class U95<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is core.List<core.int> Function(int y, |
- [Function x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m11 is core.List<core.int> Function(int y, [Function x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -565,8 +544,8 @@ class U95<T> { |
Expect.isTrue(f12 is F12); |
Expect.isTrue(confuse(f12) is F12); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int x2, |
- [core.List<core.int> x3]) Function<B extends core.int>(int x) l12; |
+ core.List<core.int> Function(int x2, [core.List<core.int> x3]) |
+ Function<B extends core.int>(int x) l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -577,7 +556,8 @@ class U95<T> { |
Expect.isTrue(m12 is F12); |
Expect.isTrue(m12 is core.List<core.int> 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(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -617,7 +597,7 @@ class U95<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); |
}); |
@@ -655,8 +635,8 @@ class U95<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function( |
- core.List<core.int> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m14 is List<T> Function(core.List<core.int> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -671,7 +651,7 @@ class U95<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); |
}); |
@@ -735,8 +715,8 @@ class U95<T> { |
} |
Expect.isTrue(m16 is F16); |
- Expect.isTrue(m16 is Function( |
- [List<Function> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m16 is Function([List<Function> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m16) is F16); |
// In checked mode, verifies the type. |
x16 = m16; |
@@ -776,7 +756,7 @@ class U95<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); |
}); |
@@ -813,8 +793,8 @@ class U95<T> { |
} |
Expect.isTrue(m18 is F18); |
- Expect.isTrue(m18 is void Function(int y, |
- {Function x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m18 is void Function(int y, {Function x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m18) is F18); |
// In checked mode, verifies the type. |
x18 = m18; |
@@ -838,8 +818,8 @@ class U95<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function(int x1, |
- [List<T> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m19 is void Function(int x1, [List<T> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -854,7 +834,7 @@ class U95<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); |
}); |
@@ -893,8 +873,8 @@ class U95<T> { |
} |
Expect.isTrue(m20 is F20); |
- Expect.isTrue(m20 is Function Function<A>( |
- List<A> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m20 is Function Function<A>(List<A> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m20) is F20); |
// In checked mode, verifies the type. |
x20 = m20; |
@@ -943,8 +923,8 @@ class U95<T> { |
} |
Expect.isTrue(m22 is F22); |
- Expect.isTrue(m22 is void Function<A>( |
- Function x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m22 is void Function<A>(Function x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m22) is F22); |
// In checked mode, verifies the type. |
x22 = m22; |