Skip to content

Commit fea0830

Browse files
committed
ASTBridging: Bridge swift::RequirementReprKind directly
1 parent af1a615 commit fea0830

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

include/swift/AST/ASTBridging.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ class CanType;
7777
class TypeBase;
7878
class StmtConditionElement;
7979
class SubstitutionMap;
80+
enum class RequirementReprKind : unsigned;
8081
}
8182

8283
struct BridgedASTType;
@@ -2898,15 +2899,9 @@ BridgedLayoutConstraint_getLayoutConstraint(BridgedASTContext cContext,
28982899
swift::LayoutConstraintKind kind,
28992900
size_t size, size_t alignment);
29002901

2901-
enum ENUM_EXTENSIBILITY_ATTR(open) BridgedRequirementReprKind : size_t {
2902-
BridgedRequirementReprKindTypeConstraint,
2903-
BridgedRequirementReprKindSameType,
2904-
BridgedRequirementReprKindLayoutConstraint,
2905-
};
2906-
29072902
struct BridgedRequirementRepr {
29082903
BridgedSourceLoc SeparatorLoc;
2909-
BridgedRequirementReprKind Kind;
2904+
swift::RequirementReprKind Kind;
29102905
BridgedTypeRepr FirstType;
29112906
BridgedNullableTypeRepr SecondType;
29122907
BridgedLayoutConstraint LayoutConstraint;

lib/AST/Bridging/GenericsBridging.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ BridgedTrailingWhereClause_createParsed(BridgedASTContext cContext,
9898

9999
RequirementRepr BridgedRequirementRepr::unbridged() const {
100100
switch (Kind) {
101-
case BridgedRequirementReprKindTypeConstraint:
101+
case RequirementReprKind::TypeConstraint:
102102
return RequirementRepr::getTypeConstraint(
103103
FirstType.unbridged(), SeparatorLoc.unbridged(), SecondType.unbridged(),
104104
IsExpansionPattern);
105-
case BridgedRequirementReprKindSameType:
105+
case RequirementReprKind::SameType:
106106
return RequirementRepr::getSameType(
107107
FirstType.unbridged(), SeparatorLoc.unbridged(), SecondType.unbridged(),
108108
IsExpansionPattern);
109-
case BridgedRequirementReprKindLayoutConstraint:
109+
case RequirementReprKind::LayoutConstraint:
110110
return RequirementRepr::getLayoutConstraint(
111111
FirstType.unbridged(), SeparatorLoc.unbridged(),
112112
{LayoutConstraint.unbridged(), LayoutConstraintLoc.unbridged()},
@@ -119,7 +119,7 @@ BridgedRequirementRepr BridgedRequirementRepr_createTypeConstraint(
119119
BridgedTypeRepr cConstraint, bool isExpansionPattern) {
120120
return {
121121
/*SeparatorLoc=*/cColonLoc,
122-
/*Kind=*/BridgedRequirementReprKindTypeConstraint,
122+
/*Kind=*/RequirementReprKind::TypeConstraint,
123123
/*FirstType=*/cSubject,
124124
/*SecondType=*/cConstraint.unbridged(),
125125
/*LayoutConstraint=*/{},
@@ -133,7 +133,7 @@ BridgedRequirementRepr BridgedRequirementRepr_createSameType(
133133
BridgedTypeRepr cSecondType, bool isExpansionPattern) {
134134
return {
135135
/*SeparatorLoc=*/cEqualLoc,
136-
/*Kind=*/BridgedRequirementReprKindSameType,
136+
/*Kind=*/RequirementReprKind::SameType,
137137
/*FirstType=*/cFirstType,
138138
/*SecondType=*/cSecondType.unbridged(),
139139
/*LayoutConstraint=*/{},
@@ -148,7 +148,7 @@ BridgedRequirementRepr BridgedRequirementRepr_createLayoutConstraint(
148148
bool isExpansionPattern) {
149149
return {
150150
/*SeparatorLoc=*/cColonLoc,
151-
/*Kind=*/BridgedRequirementReprKindLayoutConstraint,
151+
/*Kind=*/RequirementReprKind::LayoutConstraint,
152152
/*FirstType=*/cSubject,
153153
/*SecondType=*/nullptr,
154154
/*LayoutConstraint=*/cLayout,

0 commit comments

Comments
 (0)