Index: tests/language/function_type/function_type39_test.dart |
diff --git a/tests/language/function_type/function_type39_test.dart b/tests/language/function_type/function_type39_test.dart |
index 431f2188c29ddeac9e95fb78def99cbe3dadb2c0..47875f2c6c4055cafa6921b0d7a86c10d3384f67 100644 |
--- a/tests/language/function_type/function_type39_test.dart |
+++ b/tests/language/function_type/function_type39_test.dart |
@@ -19,68 +19,48 @@ 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 x1, [core.List<core.int> x2]); |
-typedef F1<T> |
- = List<Function> Function([List<Function> x1]); |
-typedef F2<T> |
- = List<T> Function(Function x0); |
-typedef F3<T> |
- = void Function(int y, [int x]); |
-typedef F4<T> |
- = Function<A>(List<A> x); |
-typedef F5<T> |
- = int Function(int x, [Function x1]) Function<B extends core.int>(int x); |
-typedef F6<T> |
- = int Function(int y, {core.List<core.int> x}) Function<B extends core.int>( |
- int x); |
-typedef F7<T> |
- = Function Function([Function x]) Function<B extends core.int>(int x); |
-typedef F8<T> |
- = Function Function(core.List<core.int> x1) Function<B extends core.int>( |
- int x); |
-typedef F9<T> |
- = List<Function> Function(int x2, [int x3]) Function<B extends core.int>( |
- int x); |
-typedef F10<T> |
- = List<Function> Function(int x1, |
- {List<Function> x}) Function<B extends core.int>(int x); |
-typedef F11<T> |
- = core.List<core.int> Function(int x) Function<B extends core.int>(int x); |
-typedef F12<T> |
- = core.List<core.int> Function(int y, |
- [List<Function> x]) Function<B extends core.int>(int x); |
-typedef F13<T> |
- = core.List<core.int> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>(int x); |
-typedef F14<T> |
- = List<T> Function({Function x}) Function<B extends core.int>(int x); |
-typedef F15<T> |
- = List<T> Function(List<T> x) Function<B extends core.int>(int x); |
-typedef F16<T> |
- = Function(int x1, [Function x]) Function<B extends core.int>(int x); |
-typedef F17<T> |
- = Function([core.List<core.int> x1]) Function<B extends core.int>(int x); |
-typedef F18<T> |
- = void Function(int x, [int x1]) Function<B extends core.int>(int x); |
-typedef F19<T> |
- = void Function(int y, {List<Function> x}) Function<B extends core.int>( |
- int x); |
-typedef F20<T> |
- = int Function<A>(Function x) Function<B extends core.int>(int x); |
-typedef F21<T> |
- = core.List<core.int> Function<A>( |
- List<Function> x) Function<B extends core.int>(int x); |
-typedef F22<T> |
- = A Function<A>(core.List<core.int> x) Function<B extends core.int>(int x); |
-typedef F23<T> |
- = B Function(int x) Function<B extends core.int>(int x); |
+typedef F0<T> = int Function(int x1, [core.List<core.int> x2]); |
+typedef F1<T> = List<Function> Function([List<Function> x1]); |
+typedef F2<T> = List<T> Function(Function x0); |
+typedef F3<T> = void Function(int y, [int x]); |
+typedef F4<T> = Function<A>(List<A> x); |
+typedef F5<T> = int Function(int x, [Function x1]) Function<B extends core.int>( |
+ int x); |
+typedef F6<T> = int Function(int y, {core.List<core.int> x}) |
+ Function<B extends core.int>(int x); |
+typedef F7<T> = Function Function([Function x]) Function<B extends core.int>( |
+ int x); |
+typedef F8<T> = Function Function(core.List<core.int> x1) |
+ Function<B extends core.int>(int x); |
+typedef F9<T> = List<Function> Function(int x2, [int x3]) |
+ Function<B extends core.int>(int x); |
+typedef F10<T> = List<Function> Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>(int x); |
+typedef F11<T> = core.List<core.int> Function(int x) |
+ Function<B extends core.int>(int x); |
+typedef F12<T> = core.List<core.int> Function(int y, [List<Function> x]) |
+ Function<B extends core.int>(int x); |
+typedef F13<T> = core.List<core.int> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>(int x); |
+typedef F14<T> = List<T> Function({Function x}) Function<B extends core.int>( |
+ int x); |
+typedef F15<T> = List<T> Function(List<T> x) Function<B extends core.int>( |
+ int x); |
+typedef F16<T> = Function(int x1, [Function x]) Function<B extends core.int>( |
+ int x); |
+typedef F17<T> = Function([core.List<core.int> x1]) |
+ Function<B extends core.int>(int x); |
+typedef F18<T> = void Function(int x, [int x1]) Function<B extends core.int>( |
+ int x); |
+typedef F19<T> = void Function(int y, {List<Function> x}) |
+ Function<B extends core.int>(int x); |
+typedef F20<T> = int Function<A>(Function x) Function<B extends core.int>( |
+ int x); |
+typedef F21<T> = core.List<core.int> Function<A>(List<Function> x) |
+ Function<B extends core.int>(int x); |
+typedef F22<T> = A Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>(int x); |
+typedef F23<T> = B Function(int x) Function<B extends core.int>(int x); |
int f0(int x0, [core.List<core.int> x1]) => null; |
List<Function> f1([List<Function> x0]) => null; |
@@ -134,13 +114,13 @@ class U39<T> { |
x8; |
List<Function> Function(int x2, [int x3]) Function<B extends core.int>(int x) |
x9; |
- List<Function> Function(int x1, |
- {List<Function> x}) Function<B extends core.int>(int x) x10; |
+ List<Function> Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>(int x) x10; |
core.List<core.int> Function(int x) Function<B extends core.int>(int x) x11; |
- core.List<core.int> Function(int y, |
- [List<Function> x]) Function<B extends core.int>(int x) x12; |
- core.List<core.int> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>(int x) x13; |
+ core.List<core.int> Function(int y, [List<Function> x]) |
+ Function<B extends core.int>(int x) x12; |
+ core.List<core.int> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>(int x) x13; |
List<T> Function({Function x}) Function<B extends core.int>(int x) x14; |
List<T> Function(List<T> x) Function<B extends core.int>(int x) x15; |
Function(int x1, [Function x]) Function<B extends core.int>(int x) x16; |
@@ -149,8 +129,8 @@ class U39<T> { |
void Function(int y, {List<Function> x}) Function<B extends core.int>(int x) |
x19; |
int Function<A>(Function x) Function<B extends core.int>(int x) x20; |
- core.List<core.int> Function<A>( |
- List<Function> x) Function<B extends core.int>(int x) x21; |
+ core.List<core.int> Function<A>(List<Function> x) |
+ Function<B extends core.int>(int x) x21; |
A Function<A>(core.List<core.int> x) Function<B extends core.int>(int x) x22; |
B Function(int x) Function<B extends core.int>(int x) x23; |
@@ -298,7 +278,7 @@ class U39<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); |
}); |
@@ -383,8 +363,8 @@ class U39<T> { |
} |
Expect.isTrue(m5 is F5); |
- Expect.isTrue(m5 is int Function(int x, |
- [Function x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m5 is int Function(int x, [Function x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m5) is F5); |
// In checked mode, verifies the type. |
x5 = m5; |
@@ -409,8 +389,8 @@ class U39<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is int Function(int y, |
- {core.List<core.int> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m6 is int Function(int y, {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; |
@@ -434,8 +414,8 @@ class U39<T> { |
} |
Expect.isTrue(m7 is F7); |
- Expect.isTrue(m7 is Function Function( |
- [Function x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m7 is Function Function([Function x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m7) is F7); |
// In checked mode, verifies the type. |
x7 = m7; |
@@ -460,8 +440,8 @@ class U39<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function( |
- core.List<core.int> x1) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m8 is Function Function(core.List<core.int> x1) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -486,8 +466,8 @@ class U39<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is List<Function> Function(int x2, |
- [int x3]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m9 is List<Function> Function(int x2, [int x3]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -501,8 +481,8 @@ class U39<T> { |
Expect.isTrue(f10 is F10); |
Expect.isTrue(confuse(f10) is F10); |
// In checked mode, verifies the type. |
- List<Function> Function(int x1, |
- {List<Function> x}) Function<B extends core.int>(int x) l10; |
+ List<Function> Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>(int x) l10; |
// The static function f10 sets `T` to `int`. |
if (!tIsBool) { |
x10 = f10 as dynamic; |
@@ -512,8 +492,8 @@ class U39<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int x1, |
- {List<Function> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m10 is List<Function> Function(int x1, {List<Function> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -537,8 +517,8 @@ class U39<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is core.List<core.int> Function( |
- int x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m11 is core.List<core.int> Function(int x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -552,8 +532,8 @@ class U39<T> { |
Expect.isTrue(f12 is F12); |
Expect.isTrue(confuse(f12) is F12); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int y, |
- [List<Function> x]) Function<B extends core.int>(int x) l12; |
+ core.List<core.int> Function(int y, [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; |
@@ -563,8 +543,8 @@ class U39<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function(int y, |
- [List<Function> x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m12 is core.List<core.int> Function(int y, [List<Function> x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -578,8 +558,8 @@ class U39<T> { |
Expect.isTrue(f13 is F13); |
Expect.isTrue(confuse(f13) is F13); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>(int x) l13; |
+ core.List<core.int> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>(int x) l13; |
// The static function f13 sets `T` to `int`. |
if (!tIsBool) { |
x13 = f13 as dynamic; |
@@ -589,8 +569,8 @@ class U39<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is core.List<core.int> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m13 is core.List<core.int> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -605,15 +585,15 @@ class U39<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); |
}); |
Expect.throws(() { |
x13 = confuse(f13); |
}); |
- core.List<core.int> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>(int x) l13; |
+ core.List<core.int> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>(int x) l13; |
Expect.throws(() { |
l13 = (f13 as dynamic); |
}); |
@@ -621,8 +601,8 @@ class U39<T> { |
l13 = confuse(f13); |
}); |
} |
- core.List<core.int> Function(int x2, |
- [List<T> x3]) Function<B extends core.int>(int x) l13 = m13; |
+ core.List<core.int> Function(int x2, [List<T> x3]) |
+ Function<B extends core.int>(int x) l13 = m13; |
// In checked mode, verifies the type. |
x13 = m13; |
x13 = confuse(m13); |
@@ -644,8 +624,8 @@ class U39<T> { |
} |
Expect.isTrue(m14 is F14); |
- Expect.isTrue(m14 is List<T> Function( |
- {Function x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m14 is List<T> Function({Function x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m14) is F14); |
// In checked mode, verifies the type. |
x14 = m14; |
@@ -660,7 +640,7 @@ class U39<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); |
}); |
@@ -714,7 +694,7 @@ class U39<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); |
}); |
@@ -751,8 +731,8 @@ class U39<T> { |
} |
Expect.isTrue(m16 is F16); |
- Expect.isTrue(m16 is Function(int x1, |
- [Function x]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m16 is Function(int x1, [Function x]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m16) is F16); |
// In checked mode, verifies the type. |
x16 = m16; |
@@ -776,8 +756,8 @@ class U39<T> { |
} |
Expect.isTrue(m17 is F17); |
- Expect.isTrue(m17 is Function( |
- [core.List<core.int> x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m17 is Function([core.List<core.int> x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m17) is F17); |
// In checked mode, verifies the type. |
x17 = m17; |
@@ -801,8 +781,8 @@ class U39<T> { |
} |
Expect.isTrue(m18 is F18); |
- Expect.isTrue(m18 is void Function(int x, |
- [int x1]) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m18 is void Function(int x, [int x1]) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m18) is F18); |
// In checked mode, verifies the type. |
x18 = m18; |
@@ -827,8 +807,8 @@ class U39<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function(int y, |
- {List<Function> x}) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m19 is void Function(int y, {List<Function> x}) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -867,8 +847,8 @@ class U39<T> { |
Expect.isTrue(f21 is F21); |
Expect.isTrue(confuse(f21) is F21); |
// In checked mode, verifies the type. |
- core.List<core.int> Function<A>( |
- List<Function> x) Function<B extends core.int>(int x) l21; |
+ core.List<core.int> Function<A>(List<Function> x) |
+ Function<B extends core.int>(int x) l21; |
// The static function f21 sets `T` to `int`. |
if (!tIsBool) { |
x21 = f21 as dynamic; |
@@ -878,8 +858,8 @@ class U39<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is core.List<core.int> Function<A>( |
- List<Function> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m21 is core.List<core.int> Function<A>(List<Function> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |
@@ -904,8 +884,8 @@ class U39<T> { |
} |
Expect.isTrue(m22 is F22); |
- Expect.isTrue(m22 is A Function<A>( |
- core.List<core.int> x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m22 is A Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m22) is F22); |
// In checked mode, verifies the type. |
x22 = m22; |