Skip to content

Commit b45b6ae

Browse files
authored
[swift2objc] Enum support (dart-lang#2955)
1 parent 20d244b commit b45b6ae

26 files changed

Lines changed: 803 additions & 382 deletions

‎pkgs/swift2objc/lib/src/ast/_core/interfaces/enum_declaration.dart‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pkgs/swift2objc/lib/src/ast/declarations/built_in/built_in_declaration.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ const builtInDeclarations = [
6060
_stringDecl,
6161
_voidDecl,
6262

63+
// TODO(https://github.com/dart-lang/native/issues/2954): This shouldn't be
64+
// treated as an ordinary built-in.
65+
BuiltInDeclaration(id: 's:s6HasherV', name: 'Hasher'),
66+
6367
// Certain types are toll-free bridged between Swift and ObjC. These types
6468
// don't need @objc compatible wrappers. There's no complete list of these
6569
// types in the documentation. The closest thing is this, but it's incomplete:

‎pkgs/swift2objc/lib/src/ast/declarations/compounds/class_declaration.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class ClassDeclaration extends AstNode
3232
List<AvailabilityInfo> availability;
3333

3434
@override
35-
covariant List<PropertyDeclaration> properties;
35+
List<PropertyDeclaration> properties;
3636

3737
@override
38-
covariant List<MethodDeclaration> methods;
38+
List<MethodDeclaration> methods;
3939

4040
@override
4141
List<DeclaredType<ProtocolDeclaration>> conformedProtocols;

pkgs/swift2objc/lib/src/ast/declarations/enums/associated_value_enum_declaration.dart renamed to pkgs/swift2objc/lib/src/ast/declarations/compounds/enum_declaration.dart

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,20 @@
44

55
import '../../../config.dart';
66
import '../../_core/interfaces/availability.dart';
7-
import '../../_core/interfaces/enum_declaration.dart';
7+
import '../../_core/interfaces/compound_declaration.dart';
8+
import '../../_core/interfaces/declaration.dart';
89
import '../../_core/interfaces/nestable_declaration.dart';
910
import '../../_core/interfaces/parameterizable.dart';
1011
import '../../_core/shared/parameter.dart';
1112
import '../../_core/shared/referred_type.dart';
1213
import '../../ast_node.dart';
13-
import '../compounds/protocol_declaration.dart';
14+
import 'members/initializer_declaration.dart';
15+
import 'members/method_declaration.dart';
16+
import 'members/property_declaration.dart';
17+
import 'protocol_declaration.dart';
1418

15-
/// Describes the declaration of a Swift enum with associated values.
16-
class AssociatedValueEnumDeclaration extends AstNode
17-
implements EnumDeclaration {
19+
/// Describes the declaration of a Swift enum.
20+
class EnumDeclaration extends AstNode implements CompoundDeclaration {
1821
@override
1922
String id;
2023

@@ -27,8 +30,16 @@ class AssociatedValueEnumDeclaration extends AstNode
2730
@override
2831
List<AvailabilityInfo> availability;
2932

33+
List<EnumCaseDeclaration> cases;
34+
35+
@override
36+
List<PropertyDeclaration> properties;
37+
38+
@override
39+
List<MethodDeclaration> methods;
40+
3041
@override
31-
covariant List<AssociatedValueEnumCase> cases;
42+
List<InitializerDeclaration> initializers;
3243

3344
@override
3445
List<GenericType> typeParams;
@@ -42,36 +53,41 @@ class AssociatedValueEnumDeclaration extends AstNode
4253
@override
4354
List<InnerNestableDeclaration> nestedDeclarations;
4455

45-
AssociatedValueEnumDeclaration({
56+
EnumDeclaration({
4657
required this.id,
4758
required this.name,
4859
required this.source,
4960
required this.availability,
5061
required this.cases,
51-
required this.typeParams,
52-
required this.conformedProtocols,
62+
required this.properties,
63+
required this.methods,
64+
required this.initializers,
65+
this.conformedProtocols = const [],
66+
this.typeParams = const [],
5367
this.nestingParent,
5468
this.nestedDeclarations = const [],
5569
});
5670

5771
@override
58-
void visit(Visitation visitation) =>
59-
visitation.visitAssociatedValueEnumDeclaration(this);
72+
void visit(Visitation visitation) => visitation.visitEnumDeclaration(this);
6073

6174
@override
6275
void visitChildren(Visitor visitor) {
6376
super.visitChildren(visitor);
6477
visitor.visitAll(cases);
78+
visitor.visitAll(properties);
79+
visitor.visitAll(methods);
80+
visitor.visitAll(initializers);
6581
visitor.visitAll(typeParams);
6682
visitor.visitAll(conformedProtocols);
6783
visitor.visit(nestingParent);
6884
visitor.visitAll(nestedDeclarations);
6985
}
7086
}
7187

72-
/// Describes the declaration of a Swift enum case with associated values.
73-
class AssociatedValueEnumCase extends AstNode
74-
implements EnumCase, Parameterizable {
88+
/// Describes the declaration of a Swift enum case.
89+
class EnumCaseDeclaration extends AstNode
90+
implements Declaration, Parameterizable {
7591
@override
7692
String id;
7793

@@ -85,9 +101,9 @@ class AssociatedValueEnumCase extends AstNode
85101
List<AvailabilityInfo> availability;
86102

87103
@override
88-
covariant List<AssociatedValueParam> params;
104+
List<EnumCaseParam> params;
89105

90-
AssociatedValueEnumCase({
106+
EnumCaseDeclaration({
91107
required this.id,
92108
required this.name,
93109
required this.source,
@@ -100,10 +116,13 @@ class AssociatedValueEnumCase extends AstNode
100116
super.visitChildren(visitor);
101117
visitor.visitAll(params);
102118
}
119+
120+
@override
121+
String toString() => '$name(${params.map((p) => '$p').join(', ')})';
103122
}
104123

105-
/// Describes an associated value of an Swift enum case.
106-
class AssociatedValueParam extends AstNode implements Parameter {
124+
/// Describes an associated value of a Swift enum case.
125+
class EnumCaseParam extends AstNode implements Parameter {
107126
@override
108127
String name;
109128

@@ -113,11 +132,14 @@ class AssociatedValueParam extends AstNode implements Parameter {
113132
@override
114133
covariant Null internalName;
115134

116-
AssociatedValueParam({required this.name, required this.type});
135+
EnumCaseParam({required this.name, required this.type});
117136

118137
@override
119138
void visitChildren(Visitor visitor) {
120139
super.visitChildren(visitor);
121140
visitor.visit(type);
122141
}
142+
143+
@override
144+
String toString() => '${name == '' ? '' : '$name: '}$type';
123145
}

‎pkgs/swift2objc/lib/src/ast/declarations/compounds/protocol_declaration.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class ProtocolDeclaration extends AstNode implements CompoundDeclaration {
2727
List<AvailabilityInfo> availability;
2828

2929
@override
30-
covariant List<PropertyDeclaration> properties;
30+
List<PropertyDeclaration> properties;
3131

3232
@override
33-
covariant List<MethodDeclaration> methods;
33+
List<MethodDeclaration> methods;
3434

3535
@override
3636
List<DeclaredType<ProtocolDeclaration>> conformedProtocols;

‎pkgs/swift2objc/lib/src/ast/declarations/compounds/struct_declaration.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ class StructDeclaration extends AstNode implements CompoundDeclaration {
2828
List<AvailabilityInfo> availability;
2929

3030
@override
31-
covariant List<PropertyDeclaration> properties;
31+
List<PropertyDeclaration> properties;
3232

3333
@override
34-
covariant List<MethodDeclaration> methods;
34+
List<MethodDeclaration> methods;
3535

3636
@override
3737
List<DeclaredType<ProtocolDeclaration>> conformedProtocols;

‎pkgs/swift2objc/lib/src/ast/declarations/enums/normal_enum_declaration.dart‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)