Index: tests/language/function_type/function_type98_test.dart |
diff --git a/tests/language/function_type/function_type98_test.dart b/tests/language/function_type/function_type98_test.dart |
index 4e6857a82a8363dd56440f7f87fda263239f3882..74318d0b505ae81a3ec52216e7c93fd62d864c27 100644 |
--- a/tests/language/function_type/function_type98_test.dart |
+++ b/tests/language/function_type/function_type98_test.dart |
@@ -19,61 +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> |
- = Function Function(int x0, {core.List<core.int> x}); |
-typedef F1<T> |
- = core.List<core.int> Function({List<Function> x}); |
-typedef F2<T> |
- = Function(int x, [Function x2]); |
-typedef F3<T> |
- = int Function<A>(A x); |
-typedef F4<T> |
- = int Function({int x}) Function<B extends core.int>(); |
-typedef F5<T> |
- = int Function(core.List<core.int> x) Function<B extends core.int>(); |
-typedef F6<T> |
- = Function Function(int x1, [int x]) Function<B extends core.int>(); |
-typedef F7<T> |
- = Function Function([List<Function> x1]) Function<B extends core.int>(); |
-typedef F8<T> |
- = Function Function({List<T> x}) Function<B extends core.int>(); |
-typedef F9<T> |
- = List<Function> Function(int y, |
- {Function x}) Function<B extends core.int>(); |
-typedef F10<T> |
- = List<Function> Function(int x1, |
- [List<T> x]) Function<B extends core.int>(); |
-typedef F11<T> |
- = core.List<core.int> Function(Function x1) Function<B extends core.int>(); |
-typedef F12<T> |
- = core.List<core.int> Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>(); |
-typedef F13<T> |
- = List<T> Function(int x1, {int x}) Function<B extends core.int>(); |
-typedef F14<T> |
- = List<T> Function([core.List<core.int> x]) Function<B extends core.int>(); |
-typedef F15<T> |
- = Function(int y, [int x]) Function<B extends core.int>(); |
-typedef F16<T> |
- = Function(int x2, [List<Function> x3]) Function<B extends core.int>(); |
-typedef F17<T> |
- = Function(int x1, {List<T> x}) Function<B extends core.int>(); |
-typedef F18<T> |
- = void Function(List<Function> x) Function<B extends core.int>(); |
-typedef F19<T> |
- = void Function(int y, [List<T> x]) Function<B extends core.int>(); |
-typedef F20<T> |
- = List<Function> Function<A>(int x) Function<B extends core.int>(); |
-typedef F21<T> |
- = Function<A>(Function x) Function<B extends core.int>(); |
-typedef F22<T> |
- = void Function<A>(List<Function> x) Function<B extends core.int>(); |
+typedef F0<T> = Function Function(int x0, {core.List<core.int> x}); |
+typedef F1<T> = core.List<core.int> Function({List<Function> x}); |
+typedef F2<T> = Function(int x, [Function x2]); |
+typedef F3<T> = int Function<A>(A x); |
+typedef F4<T> = int Function({int x}) Function<B extends core.int>(); |
+typedef F5<T> = int Function(core.List<core.int> x) |
+ Function<B extends core.int>(); |
+typedef F6<T> = Function Function(int x1, [int x]) |
+ Function<B extends core.int>(); |
+typedef F7<T> = Function Function([List<Function> x1]) |
+ Function<B extends core.int>(); |
+typedef F8<T> = Function Function({List<T> x}) Function<B extends core.int>(); |
+typedef F9<T> = List<Function> Function(int y, {Function x}) |
+ Function<B extends core.int>(); |
+typedef F10<T> = List<Function> Function(int x1, [List<T> x]) |
+ Function<B extends core.int>(); |
+typedef F11<T> = core.List<core.int> Function(Function x1) |
+ Function<B extends core.int>(); |
+typedef F12<T> = core.List<core.int> Function(int x, [core.List<core.int> x1]) |
+ Function<B extends core.int>(); |
+typedef F13<T> = List<T> Function(int x1, {int x}) |
+ Function<B extends core.int>(); |
+typedef F14<T> = List<T> Function([core.List<core.int> x]) |
+ Function<B extends core.int>(); |
+typedef F15<T> = Function(int y, [int x]) Function<B extends core.int>(); |
+typedef F16<T> = Function(int x2, [List<Function> x3]) |
+ Function<B extends core.int>(); |
+typedef F17<T> = Function(int x1, {List<T> x}) Function<B extends core.int>(); |
+typedef F18<T> = void Function(List<Function> x) Function<B extends core.int>(); |
+typedef F19<T> = void Function(int y, [List<T> x]) |
+ Function<B extends core.int>(); |
+typedef F20<T> = List<Function> Function<A>(int x) |
+ Function<B extends core.int>(); |
+typedef F21<T> = Function<A>(Function x) Function<B extends core.int>(); |
+typedef F22<T> = void Function<A>(List<Function> x) |
+ Function<B extends core.int>(); |
Function f0(int x0, {core.List<core.int> x}) => null; |
core.List<core.int> f1({List<Function> x}) => null; |
@@ -120,8 +101,8 @@ class U98<T> { |
List<Function> Function(int x1, [List<T> x]) Function<B extends core.int>() |
x10; |
core.List<core.int> Function(Function x1) Function<B extends core.int>() x11; |
- core.List<core.int> Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>() x12; |
+ core.List<core.int> Function(int x, [core.List<core.int> x1]) |
+ Function<B extends core.int>() x12; |
List<T> Function(int x1, {int x}) Function<B extends core.int>() x13; |
List<T> Function([core.List<core.int> x]) Function<B extends core.int>() x14; |
Function(int y, [int x]) Function<B extends core.int>() x15; |
@@ -323,8 +304,8 @@ class U98<T> { |
} |
Expect.isTrue(m5 is F5); |
- Expect.isTrue(m5 is int Function( |
- core.List<core.int> x) Function<B extends core.int>()); |
+ Expect.isTrue(m5 is int Function(core.List<core.int> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m5) is F5); |
// In checked mode, verifies the type. |
x5 = m5; |
@@ -348,8 +329,8 @@ class U98<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is Function Function(int x1, |
- [int x]) Function<B extends core.int>()); |
+ Expect.isTrue(m6 is Function Function(int x1, [int x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m6) is F6); |
// In checked mode, verifies the type. |
x6 = m6; |
@@ -373,8 +354,8 @@ class U98<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function( |
- [List<Function> x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m7 is Function Function([List<Function> x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -414,7 +395,7 @@ class U98<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); |
}); |
@@ -452,8 +433,8 @@ class U98<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function(int y, |
- {Function x}) Function<B extends core.int>()); |
+ Expect.isTrue(m9 is List<Function> Function(int y, {Function x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -478,8 +459,8 @@ class U98<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int x1, |
- [List<T> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m10 is List<Function> Function(int x1, [List<T> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -494,15 +475,15 @@ class U98<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); |
}); |
Expect.throws(() { |
x10 = confuse(f10); |
}); |
- List<Function> Function(int x1, |
- [List<T> x]) Function<B extends core.int>() l10; |
+ List<Function> Function(int x1, [List<T> x]) |
+ Function<B extends core.int>() l10; |
Expect.throws(() { |
l10 = (f10 as dynamic); |
}); |
@@ -510,8 +491,8 @@ class U98<T> { |
l10 = confuse(f10); |
}); |
} |
- List<Function> Function(int x1, |
- [List<T> x]) Function<B extends core.int>() l10 = m10; |
+ List<Function> Function(int x1, [List<T> x]) |
+ Function<B extends core.int>() l10 = m10; |
// In checked mode, verifies the type. |
x10 = m10; |
x10 = confuse(m10); |
@@ -534,8 +515,8 @@ class U98<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is core.List<core.int> Function( |
- Function x1) Function<B extends core.int>()); |
+ Expect.isTrue(m11 is core.List<core.int> Function(Function x1) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -549,8 +530,8 @@ class U98<T> { |
Expect.isTrue(f12 is F12); |
Expect.isTrue(confuse(f12) is F12); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>() l12; |
+ core.List<core.int> Function(int x, [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; |
@@ -561,7 +542,8 @@ class U98<T> { |
Expect.isTrue(m12 is F12); |
Expect.isTrue(m12 is core.List<core.int> Function(int x, |
- [core.List<core.int> x1]) Function<B extends core.int>()); |
+ [core.List<core.int> x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -585,8 +567,8 @@ class U98<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is List<T> Function(int x1, |
- {int x}) Function<B extends core.int>()); |
+ Expect.isTrue(m13 is List<T> Function(int x1, {int x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -601,7 +583,7 @@ class U98<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); |
}); |
@@ -640,8 +622,8 @@ class U98<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function( |
- [core.List<core.int> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m14 is List<T> Function([core.List<core.int> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -656,7 +638,7 @@ class U98<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); |
}); |
@@ -720,8 +702,8 @@ class U98<T> { |
} |
Expect.isTrue(m16 is F16); |
- Expect.isTrue(m16 is Function(int x2, |
- [List<Function> x3]) Function<B extends core.int>()); |
+ Expect.isTrue(m16 is Function(int x2, [List<Function> x3]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m16) is F16); |
// In checked mode, verifies the type. |
x16 = m16; |
@@ -761,7 +743,7 @@ class U98<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); |
}); |
@@ -823,8 +805,8 @@ class U98<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function(int y, |
- [List<T> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m19 is void Function(int y, [List<T> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -839,7 +821,7 @@ class U98<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); |
}); |
@@ -877,8 +859,8 @@ class U98<T> { |
} |
Expect.isTrue(m20 is F20); |
- Expect.isTrue(m20 is List<Function> Function<A>( |
- int x) Function<B extends core.int>()); |
+ Expect.isTrue(m20 is List<Function> Function<A>(int x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m20) is F20); |
// In checked mode, verifies the type. |
x20 = m20; |
@@ -927,8 +909,8 @@ class U98<T> { |
} |
Expect.isTrue(m22 is F22); |
- Expect.isTrue(m22 is void Function<A>( |
- List<Function> x) Function<B extends core.int>()); |
+ Expect.isTrue(m22 is void Function<A>(List<Function> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m22) is F22); |
// In checked mode, verifies the type. |
x22 = m22; |