Index: tests/language/function_type/function_type30_test.dart |
diff --git a/tests/language/function_type/function_type30_test.dart b/tests/language/function_type/function_type30_test.dart |
index f3ce29bf08bda8183554da3c7d7b77a51d7b5c8c..850160dc2a1c268db01d6313d873d9097a821812 100644 |
--- a/tests/language/function_type/function_type30_test.dart |
+++ b/tests/language/function_type/function_type30_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({List<Function> x}); |
-typedef F1<T> |
- = List<Function> Function(int x, [Function x2]); |
-typedef F2<T> |
- = List<T> Function(int x1, [int x2]); |
-typedef F3<T> |
- = Function(int x1, [List<T> x2]); |
-typedef F4<T> |
- = List<T> Function<A>(A x); |
-typedef F5<T> |
- = int Function([Function x1]) Function<B extends core.int>(); |
-typedef F6<T> |
- = int Function({core.List<core.int> x}) Function<B extends core.int>(); |
-typedef F7<T> |
- = Function Function(int y, {int x}) Function<B extends core.int>(); |
-typedef F8<T> |
- = Function Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>(); |
-typedef F9<T> |
- = List<Function> Function(int x1) Function<B extends core.int>(); |
-typedef F10<T> |
- = List<Function> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>(); |
-typedef F11<T> |
- = List<Function> Function(int y, |
- {List<T> x}) Function<B extends core.int>(); |
-typedef F12<T> |
- = core.List<core.int> Function( |
- [List<Function> x]) Function<B extends core.int>(); |
-typedef F13<T> |
- = core.List<core.int> Function(List<T> x1) Function<B extends core.int>(); |
-typedef F14<T> |
- = List<T> Function(int x2, [Function x3]) Function<B extends core.int>(); |
-typedef F15<T> |
- = List<T> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>(); |
-typedef F16<T> |
- = Function(Function x) Function<B extends core.int>(); |
-typedef F17<T> |
- = Function(int y, [core.List<core.int> x]) Function<B extends core.int>(); |
-typedef F18<T> |
- = void Function([int x1]) Function<B extends core.int>(); |
-typedef F19<T> |
- = void Function({List<Function> x}) Function<B extends core.int>(); |
-typedef F20<T> |
- = void Function() Function<B extends core.int>(); |
-typedef F21<T> |
- = core.List<core.int> Function<A>(int x) Function<B extends core.int>(); |
-typedef F22<T> |
- = A Function<A>(Function x) Function<B extends core.int>(); |
-typedef F23<T> |
- = Function(B x) Function<B extends core.int>(); |
+typedef F0<T> = int Function({List<Function> x}); |
+typedef F1<T> = List<Function> Function(int x, [Function x2]); |
+typedef F2<T> = List<T> Function(int x1, [int x2]); |
+typedef F3<T> = Function(int x1, [List<T> x2]); |
+typedef F4<T> = List<T> Function<A>(A x); |
+typedef F5<T> = int Function([Function x1]) Function<B extends core.int>(); |
+typedef F6<T> = int Function({core.List<core.int> x}) |
+ Function<B extends core.int>(); |
+typedef F7<T> = Function Function(int y, {int x}) |
+ Function<B extends core.int>(); |
+typedef F8<T> = Function Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>(); |
+typedef F9<T> = List<Function> Function(int x1) Function<B extends core.int>(); |
+typedef F10<T> = List<Function> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>(); |
+typedef F11<T> = List<Function> Function(int y, {List<T> x}) |
+ Function<B extends core.int>(); |
+typedef F12<T> = core.List<core.int> Function([List<Function> x]) |
+ Function<B extends core.int>(); |
+typedef F13<T> = core.List<core.int> Function(List<T> x1) |
+ Function<B extends core.int>(); |
+typedef F14<T> = List<T> Function(int x2, [Function x3]) |
+ Function<B extends core.int>(); |
+typedef F15<T> = List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(); |
+typedef F16<T> = Function(Function x) Function<B extends core.int>(); |
+typedef F17<T> = Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>(); |
+typedef F18<T> = void Function([int x1]) Function<B extends core.int>(); |
+typedef F19<T> = void Function({List<Function> x}) |
+ Function<B extends core.int>(); |
+typedef F20<T> = void Function() Function<B extends core.int>(); |
+typedef F21<T> = core.List<core.int> Function<A>(int x) |
+ Function<B extends core.int>(); |
+typedef F22<T> = A Function<A>(Function x) Function<B extends core.int>(); |
+typedef F23<T> = Function(B x) Function<B extends core.int>(); |
int f0({List<Function> x}) => null; |
List<Function> f1(int x, [Function x0]) => null; |
@@ -121,19 +98,19 @@ class U30<T> { |
int Function([Function x1]) Function<B extends core.int>() x5; |
int Function({core.List<core.int> x}) Function<B extends core.int>() x6; |
Function Function(int y, {int x}) Function<B extends core.int>() x7; |
- Function Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>() x8; |
+ Function Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>() x8; |
List<Function> Function(int x1) Function<B extends core.int>() x9; |
- List<Function> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>() x10; |
+ List<Function> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>() x10; |
List<Function> Function(int y, {List<T> x}) Function<B extends core.int>() |
x11; |
- core.List<core.int> Function( |
- [List<Function> x]) Function<B extends core.int>() x12; |
+ core.List<core.int> Function([List<Function> x]) |
+ Function<B extends core.int>() x12; |
core.List<core.int> Function(List<T> x1) Function<B extends core.int>() x13; |
List<T> Function(int x2, [Function x3]) Function<B extends core.int>() x14; |
- List<T> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>() x15; |
+ List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>() x15; |
Function(Function x) Function<B extends core.int>() x16; |
Function(int y, [core.List<core.int> x]) Function<B extends core.int>() x17; |
void Function([int x1]) Function<B extends core.int>() x18; |
@@ -280,7 +257,7 @@ class U30<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); |
}); |
@@ -332,7 +309,7 @@ class U30<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); |
}); |
@@ -384,7 +361,7 @@ class U30<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); |
}); |
@@ -446,8 +423,8 @@ class U30<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is int Function( |
- {core.List<core.int> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m6 is int Function({core.List<core.int> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m6) is F6); |
// In checked mode, verifies the type. |
x6 = m6; |
@@ -486,8 +463,8 @@ class U30<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>() l8; |
+ Function Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>() l8; |
// The static function f8 sets `T` to `int`. |
if (!tIsBool) { |
x8 = f8 as dynamic; |
@@ -497,8 +474,8 @@ class U30<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m8 is Function Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -537,8 +514,8 @@ class U30<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>() l10; |
+ List<Function> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>() l10; |
// The static function f10 sets `T` to `int`. |
if (!tIsBool) { |
x10 = f10 as dynamic; |
@@ -548,8 +525,8 @@ class U30<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int x, |
- [List<Function> x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m10 is List<Function> Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -574,8 +551,8 @@ class U30<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is List<Function> Function(int y, |
- {List<T> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m11 is List<Function> Function(int y, {List<T> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -590,15 +567,15 @@ class U30<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>() l11; |
+ List<Function> Function(int y, {List<T> x}) |
+ Function<B extends core.int>() l11; |
Expect.throws(() { |
l11 = (f11 as dynamic); |
}); |
@@ -619,8 +596,8 @@ class U30<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>() l12; |
+ core.List<core.int> Function([List<Function> x]) |
+ Function<B extends core.int>() l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -630,8 +607,8 @@ class U30<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function( |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m12 is core.List<core.int> Function([List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -655,8 +632,8 @@ class U30<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is core.List<core.int> Function( |
- List<T> x1) Function<B extends core.int>()); |
+ Expect.isTrue(m13 is core.List<core.int> Function(List<T> x1) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -671,7 +648,7 @@ class U30<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); |
}); |
@@ -710,8 +687,8 @@ class U30<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function(int x2, |
- [Function x3]) Function<B extends core.int>()); |
+ Expect.isTrue(m14 is List<T> Function(int x2, [Function x3]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -726,7 +703,7 @@ class U30<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); |
}); |
@@ -755,8 +732,8 @@ class U30<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>() l15; |
+ List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>() l15; |
// The static function f15 sets `T` to `int`. |
if (!tIsBool) { |
x15 = f15 as dynamic; |
@@ -766,8 +743,8 @@ class U30<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>()); |
+ Expect.isTrue(m15 is List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m15) is F15); |
// In checked mode, verifies the type. |
x15 = m15; |
@@ -782,15 +759,15 @@ class U30<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>() l15; |
+ List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>() l15; |
Expect.throws(() { |
l15 = (f15 as dynamic); |
}); |
@@ -798,8 +775,8 @@ class U30<T> { |
l15 = confuse(f15); |
}); |
} |
- List<T> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>() l15 = m15; |
+ List<T> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>() l15 = m15; |
// In checked mode, verifies the type. |
x15 = m15; |
x15 = confuse(m15); |
@@ -845,8 +822,8 @@ class U30<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m17 is Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -895,8 +872,8 @@ class U30<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function( |
- {List<Function> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m19 is void Function({List<Function> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -944,8 +921,8 @@ class U30<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is core.List<core.int> Function<A>( |
- int x) Function<B extends core.int>()); |
+ Expect.isTrue(m21 is core.List<core.int> Function<A>(int x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |