| Index: tests/language/function_type/function_type64_test.dart
|
| diff --git a/tests/language/function_type/function_type64_test.dart b/tests/language/function_type/function_type64_test.dart
|
| index 0a9498b3433375d5cac8924daf4e9ec34235e03f..e202bbe679d531be005e5b59459e688fa9d0c581 100644
|
| --- a/tests/language/function_type/function_type64_test.dart
|
| +++ b/tests/language/function_type/function_type64_test.dart
|
| @@ -19,58 +19,30 @@ 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 x});
|
| -typedef F1<T>
|
| - = List<Function> Function({List<T> x});
|
| -typedef F2<T>
|
| - = List<T> Function(int x, [core.List<core.int> x2]);
|
| -typedef F3<T>
|
| - = void Function(int x1, [List<Function> x2]);
|
| -typedef F4<T>
|
| - = int Function(int x) Function();
|
| -typedef F5<T>
|
| - = int Function(int y, [List<Function> x]) Function();
|
| -typedef F6<T>
|
| - = int Function(int x1, [List<T> x2]) Function();
|
| -typedef F7<T>
|
| - = Function Function({Function x}) Function();
|
| -typedef F8<T>
|
| - = Function Function(List<T> x) Function();
|
| -typedef F9<T>
|
| - = List<Function> Function(int x0, [Function x]) Function();
|
| -typedef F10<T>
|
| - = List<Function> Function([core.List<core.int> x1]) Function();
|
| -typedef F11<T>
|
| - = core.List<core.int> Function(int x, [int x2]) Function();
|
| -typedef F12<T>
|
| - = core.List<core.int> Function(int y, {List<Function> x}) Function();
|
| -typedef F13<T>
|
| - = List<T> Function([int x]) Function();
|
| -typedef F14<T>
|
| - = List<T> Function(List<Function> x0) Function();
|
| -typedef F15<T>
|
| - = List<T> Function(int x, [List<T> x2]) Function();
|
| -typedef F16<T>
|
| - = Function(int x0, {Function x}) Function();
|
| -typedef F17<T>
|
| - = Function([List<T> x]) Function();
|
| -typedef F18<T>
|
| - = void Function(int y, [Function x]) Function();
|
| -typedef F19<T>
|
| - = void Function(int x1, [core.List<core.int> x2]) Function();
|
| -typedef F20<T>
|
| - = Function Function<A>(int x) Function();
|
| -typedef F21<T>
|
| - = List<T> Function<A>(Function x) Function();
|
| -typedef F22<T>
|
| - = List<A> Function<A>(List<Function> x) Function();
|
| +typedef F0<T> = Function Function({int x});
|
| +typedef F1<T> = List<Function> Function({List<T> x});
|
| +typedef F2<T> = List<T> Function(int x, [core.List<core.int> x2]);
|
| +typedef F3<T> = void Function(int x1, [List<Function> x2]);
|
| +typedef F4<T> = int Function(int x) Function();
|
| +typedef F5<T> = int Function(int y, [List<Function> x]) Function();
|
| +typedef F6<T> = int Function(int x1, [List<T> x2]) Function();
|
| +typedef F7<T> = Function Function({Function x}) Function();
|
| +typedef F8<T> = Function Function(List<T> x) Function();
|
| +typedef F9<T> = List<Function> Function(int x0, [Function x]) Function();
|
| +typedef F10<T> = List<Function> Function([core.List<core.int> x1]) Function();
|
| +typedef F11<T> = core.List<core.int> Function(int x, [int x2]) Function();
|
| +typedef F12<T> = core.List<core.int> Function(int y, {List<Function> x})
|
| + Function();
|
| +typedef F13<T> = List<T> Function([int x]) Function();
|
| +typedef F14<T> = List<T> Function(List<Function> x0) Function();
|
| +typedef F15<T> = List<T> Function(int x, [List<T> x2]) Function();
|
| +typedef F16<T> = Function(int x0, {Function x}) Function();
|
| +typedef F17<T> = Function([List<T> x]) Function();
|
| +typedef F18<T> = void Function(int y, [Function x]) Function();
|
| +typedef F19<T> = void Function(int x1, [core.List<core.int> x2]) Function();
|
| +typedef F20<T> = Function Function<A>(int x) Function();
|
| +typedef F21<T> = List<T> Function<A>(Function x) Function();
|
| +typedef F22<T> = List<A> Function<A>(List<Function> x) Function();
|
|
|
| Function f0({int x}) => null;
|
| List<Function> f1({List<int> x}) => null;
|
| @@ -232,7 +204,7 @@ class U64<T> {
|
| Expect.equals(tIsDynamic, m1 is F1<bool>);
|
| Expect.equals(tIsDynamic, confuse(m1) is F1<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x1 = (f1 as dynamic);
|
| });
|
| @@ -284,7 +256,7 @@ class U64<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);
|
| });
|
| @@ -408,7 +380,7 @@ class U64<T> {
|
| Expect.equals(tIsDynamic, m6 is F6<bool>);
|
| Expect.equals(tIsDynamic, confuse(m6) is F6<bool>);
|
| } else {
|
| - if (inCheckedMode) {
|
| + if (typeAssertionsEnabled) {
|
| Expect.throws(() {
|
| x6 = (f6 as dynamic);
|
| });
|
| @@ -484,7 +456,7 @@ class U64<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);
|
| });
|
| @@ -596,8 +568,8 @@ class U64<T> {
|
| }
|
|
|
| Expect.isTrue(m12 is F12);
|
| - Expect.isTrue(m12 is core.List<core.int> Function(int y,
|
| - {List<Function> x}) Function());
|
| + Expect.isTrue(m12 is core.List<core.int> Function(int y, {List<Function> x})
|
| + Function());
|
| Expect.isTrue(confuse(m12) is F12);
|
| // In checked mode, verifies the type.
|
| x12 = m12;
|
| @@ -636,7 +608,7 @@ class U64<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);
|
| });
|
| @@ -688,7 +660,7 @@ class U64<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);
|
| });
|
| @@ -740,7 +712,7 @@ class U64<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);
|
| });
|
| @@ -816,7 +788,7 @@ class U64<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);
|
| });
|
| @@ -941,7 +913,7 @@ class U64<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);
|
| });
|
|
|