Skip to content

Commit 4b7b362

Browse files
author
sgrekhov
committed
#1285. Roll failures fixed, issue numbers added
1 parent 4fa20bd commit 4b7b362

24 files changed

+49
-92
lines changed

LanguageFeatures/Enhanced-Enum/semantics_A06_t03.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ enum E1<T1 extends num, T2> {
3636
e1<int, String>(1, "1"),
3737
e2<int, int>(2, 3);
3838

39-
const E1(this.i, this.s);
39+
const E1(this.t1, this.t2);
4040

4141
final T1 t1;
4242
final T2 t2;
@@ -52,8 +52,4 @@ main() {
5252
Expect.equals(1, E1.e2.index);
5353
Expect.equals("e1", EnumName(E1.e1).name);
5454
Expect.equals("e2", EnumName(E1.e2).name);
55-
Expect.equals(0, E2.e1.index);
56-
Expect.equals(1, E2.e2.index);
57-
Expect.equals("e1", EnumName(E2.e1).name);
58-
Expect.equals("e2", EnumName(E2.e2).name);
5955
}

LanguageFeatures/Enhanced-Enum/semantics_A06_t07.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
/// @description Check that it is a compile-time error if args are not
2929
/// compile-time constants
3030
/// @author [email protected]
31+
/// @issue 48292
32+
/// @issue 48293
3133
3234
// SharedOptions=--enable-experiment=enhanced-enums
3335

LanguageFeatures/Enhanced-Enum/semantics_A09_t01.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/// @description Check that if the resulting class would have any naming
1010
/// conflicts then compile-time error occurs.
1111
/// @author [email protected]
12+
/// @issue 48289
1213
1314
// SharedOptions=--enable-experiment=enhanced-enums
1415

@@ -30,7 +31,7 @@ enum E2<T> {
3031

3132
const E2(T t);
3233

33-
final List<E2> values = [e1, e2, e3];
34+
final List<E2> values = const [e1, e2, e3];
3435
// ^^^^^^
3536
// [analyzer] unspecified
3637
// [cfe] unspecified

LanguageFeatures/Enhanced-Enum/semantics_A09_t02.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
/// @description Check that it is a compile-time error to declare any member
1414
/// with the same basename as enum value which is not a static setter
1515
/// @author [email protected]
16+
/// @issue 48290
17+
/// @issue 48293
1618
1719
// SharedOptions=--enable-experiment=enhanced-enums
1820

@@ -33,7 +35,7 @@ enum E2<T> {
3335
e3<bool>(false);
3436

3537
const E2(T t);
36-
final List<E2> e2 = [];
38+
final List<E2> e2 = const [];
3739
// ^^
3840
// [analyzer] unspecified
3941
// [cfe] unspecified

LanguageFeatures/Enhanced-Enum/semantics_A09_t03.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
/// @description Check that it is a compile-time error to declare any member
1414
/// with the same basename as enum value which is not a static setter
1515
/// @author [email protected]
16+
/// @issue 48290
17+
/// @issue 48293
1618
1719
// SharedOptions=--enable-experiment=enhanced-enums
1820

LanguageFeatures/Enhanced-Enum/semantics_A09_t04.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
/// @description Check that it is a compile-time error to declare any member
1414
/// with the same basename as enum value which is not a static setter
1515
/// @author [email protected]
16+
/// @issue 48290
17+
/// @issue 48294
1618
1719
// SharedOptions=--enable-experiment=enhanced-enums
1820

@@ -45,7 +47,7 @@ enum E3 {
4547
e3;
4648

4749
static int get e1 => 42;
48-
// ^^
50+
// ^^
4951
// [analyzer] unspecified
5052
// [cfe] unspecified
5153
}

LanguageFeatures/Enhanced-Enum/semantics_A09_t05.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111
/// setter. (The introduced static declarations would have a conflict.)
1212
///
1313
/// @description Check that it is a compile-time error to declare any member
14-
/// with the same basename as enum value which is not a static setter
14+
/// with the same basename as enum value which is not a static setter (or static
15+
/// setter has a wrong type)
1516
/// @author [email protected]
17+
/// @issue 48293
18+
/// @issue 48295
1619
1720
// SharedOptions=--enable-experiment=enhanced-enums
1821

@@ -21,7 +24,7 @@ enum E1 {
2124
e2,
2225
e3;
2326

24-
void set e1(int v) {};
27+
void set e1(int v) {}
2528
// ^^
2629
// [analyzer] unspecified
2730
// [cfe] unspecified

LanguageFeatures/Enhanced-Enum/semantics_A09_t06.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
/// @description Check that it is a compile-time error to declare any member
1414
/// with the same basename as enum value which is not a static setter
1515
/// @author [email protected]
16+
/// @issue 48294
17+
/// @issue 48295
1618
1719
// SharedOptions=--enable-experiment=enhanced-enums
1820

@@ -21,7 +23,7 @@ enum E1 {
2123
e2,
2224
e3;
2325

24-
void e1() {};
26+
void e1() {}
2527
// ^^
2628
// [analyzer] unspecified
2729
// [cfe] unspecified

LanguageFeatures/Enhanced-Enum/semantics_A09_t08.dart

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@
1313
/// @description Check that it is a compile-time error to inherit any member
1414
/// with the same basename as enum value
1515
/// @author [email protected]
16+
/// @issue 48295
1617
1718
// SharedOptions=--enable-experiment=enhanced-enums
1819

1920
mixin M1 on Enum {
2021
int e1() => 42;
2122
}
2223

23-
mixin M2 on Enum {
24-
final int e1 = 42;
25-
}
26-
2724
mixin M3 on Enum {
2825
int get e1 => 42;
2926
}
@@ -41,15 +38,6 @@ enum E1 with M1 {
4138
e3;
4239
}
4340

44-
enum E2 with M2 {
45-
e1,
46-
//^^
47-
// [analyzer] unspecified
48-
// [cfe] unspecified
49-
e2,
50-
e3;
51-
}
52-
5341
enum E3 with M3 {
5442
e1,
5543
//^^
@@ -70,7 +58,6 @@ enum E4 with M4 {
7058

7159
main() {
7260
E1.e1;
73-
E2.e1;
7461
E3.e1;
7562
E4.e1;
7663
}

LanguageFeatures/Enhanced-Enum/semantics_A09_t09.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/// @description Check that it is a compile-time error to inherit any member
1414
/// with the same basename as enum value
1515
/// @author [email protected]
16+
/// @issue 48295
1617
1718
// SharedOptions=--enable-experiment=enhanced-enums
1819

@@ -68,6 +69,9 @@ enum E3 implements I3 {
6869
}
6970

7071
enum E4 implements I4 {
72+
// ^^
73+
// [analyzer] unspecified
74+
// [cfe] unspecified
7175
e1,
7276
//^^
7377
// [analyzer] unspecified

0 commit comments

Comments
 (0)