Skip to content

Commit 7ef884e

Browse files
committed
[NFC] [ASTGen] Make BridgedDecl.attrs property
…subsuming BridgedDecl.setAttrs(_:) as its setter.
1 parent dc307da commit 7ef884e

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

include/swift/AST/ASTBridging.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,10 @@ BridgedSILGenNameAttr BridgedSILGenNameAttr_createParsed(
841841
// MARK: Decls
842842
//===----------------------------------------------------------------------===//
843843

844-
SWIFT_NAME("BridgedDecl.setAttrs(self:_:)")
844+
SWIFT_NAME("getter:BridgedDecl.attrs(self:)")
845+
BridgedDeclAttributes BridgedDecl_getAttrs(BridgedDecl decl);
846+
847+
SWIFT_NAME("setter:BridgedDecl.attrs(self:newValue:)")
845848
void BridgedDecl_setAttrs(BridgedDecl decl, BridgedDeclAttributes attrs);
846849

847850
enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedStaticSpelling {

lib/AST/Bridging/DeclBridging.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ static AccessorKind unbridged(BridgedAccessorKind kind) {
115115
return static_cast<AccessorKind>(kind);
116116
}
117117

118+
BridgedDeclAttributes BridgedDecl_getAttrs(BridgedDecl decl) {
119+
return decl.unbridged()->getAttrs();
120+
}
121+
118122
void BridgedDecl_setAttrs(BridgedDecl decl, BridgedDeclAttributes attrs) {
119123
decl.unbridged()->getAttrs() = attrs.unbridged();
120124
}

lib/ASTGen/Sources/ASTGen/Decls.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ extension ASTGenVisitor {
9696
underlyingType: self.generate(type: node.initializer.value),
9797
genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
9898
)
99-
decl.asDecl.setAttrs(attrs.attributes)
99+
decl.asDecl.attrs = attrs.attributes
100100
return decl
101101
}
102102

@@ -118,7 +118,7 @@ extension ASTGenVisitor {
118118
end: node.memberBlock.rightBrace
119119
)
120120
)
121-
decl.asDecl.setAttrs(attrs.attributes)
121+
decl.asDecl.attrs = attrs.attributes
122122

123123
self.withDeclContext(decl.asDeclContext) {
124124
decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -145,7 +145,7 @@ extension ASTGenVisitor {
145145
end: node.memberBlock.rightBrace
146146
)
147147
)
148-
decl.asDecl.setAttrs(attrs.attributes)
148+
decl.asDecl.attrs = attrs.attributes
149149

150150
self.withDeclContext(decl.asDeclContext) {
151151
decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -173,7 +173,7 @@ extension ASTGenVisitor {
173173
),
174174
isActor: false
175175
)
176-
decl.asDecl.setAttrs(attrs.attributes)
176+
decl.asDecl.attrs = attrs.attributes
177177

178178
self.withDeclContext(decl.asDeclContext) {
179179
decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -201,7 +201,7 @@ extension ASTGenVisitor {
201201
),
202202
isActor: true
203203
)
204-
decl.asDecl.setAttrs(attrs.attributes)
204+
decl.asDecl.attrs = attrs.attributes
205205

206206
self.withDeclContext(decl.asDeclContext) {
207207
decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -231,7 +231,7 @@ extension ASTGenVisitor {
231231
end: node.memberBlock.rightBrace
232232
)
233233
)
234-
decl.asDecl.setAttrs(attrs.attributes)
234+
decl.asDecl.attrs = attrs.attributes
235235

236236
self.withDeclContext(decl.asDeclContext) {
237237
decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -254,7 +254,7 @@ extension ASTGenVisitor {
254254
defaultType: self.generate(type: node.initializer?.value),
255255
genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
256256
)
257-
decl.asDecl.setAttrs(attrs.attributes)
257+
decl.asDecl.attrs = attrs.attributes
258258
return decl
259259
}
260260
}
@@ -276,7 +276,7 @@ extension ASTGenVisitor {
276276
end: node.memberBlock.rightBrace
277277
)
278278
)
279-
decl.asDecl.setAttrs(attrs.attributes)
279+
decl.asDecl.attrs = attrs.attributes
280280

281281
self.withDeclContext(decl.asDeclContext) {
282282
decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -309,7 +309,7 @@ extension ASTGenVisitor {
309309
// All attributes goes to each element.
310310
let elements = node.elements.lazy.map({ elem -> BridgedEnumElementDecl in
311311
let elemDecl = self.generate(enumCaseElement: elem)
312-
elemDecl.asDecl.setAttrs(attrs.attributes)
312+
elemDecl.asDecl.attrs = attrs.attributes
313313
return elemDecl
314314
})
315315
return .createParsed(
@@ -536,7 +536,7 @@ extension ASTGenVisitor {
536536
arrowLoc: self.generateSourceLoc(node.returnClause.arrow),
537537
returnType: self.generate(type: node.returnClause.type)
538538
)
539-
subscriptDecl.asDecl.setAttrs(attrs.attributes)
539+
subscriptDecl.asDecl.attrs = attrs.attributes
540540

541541
if let accessors = node.accessorBlock {
542542
let storage = subscriptDecl.asAbstractStorageDecl
@@ -570,7 +570,7 @@ extension ASTGenVisitor {
570570
returnType: self.generate(type: node.signature.returnClause?.type),
571571
genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
572572
)
573-
decl.asDecl.setAttrs(attrs.attributes)
573+
decl.asDecl.attrs = attrs.attributes
574574

575575
if let body = node.body {
576576
self.withDeclContext(decl.asDeclContext) {
@@ -597,7 +597,7 @@ extension ASTGenVisitor {
597597
thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError),
598598
genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
599599
)
600-
decl.asDecl.setAttrs(attrs.attributes)
600+
decl.asDecl.attrs = attrs.attributes
601601

602602
if let body = node.body {
603603
self.withDeclContext(decl.asDeclContext) {
@@ -616,7 +616,7 @@ extension ASTGenVisitor {
616616
declContext: self.declContext,
617617
deinitKeywordLoc: self.generateSourceLoc(node.deinitKeyword)
618618
)
619-
decl.asDecl.setAttrs(attrs.attributes)
619+
decl.asDecl.attrs = attrs.attributes
620620

621621
if let body = node.body {
622622
self.withDeclContext(decl.asDeclContext) {
@@ -783,7 +783,7 @@ extension ASTGenVisitor {
783783
lowerThanNames: self.generate(precedenceGroupNameList: body.lowerThanRelation?.precedenceGroups),
784784
rightBraceLoc: self.generateSourceLoc(node.rightBrace)
785785
)
786-
decl.asDecl.setAttrs(attrs.attributes)
786+
decl.asDecl.attrs = attrs.attributes
787787
return decl
788788
}
789789
}
@@ -830,7 +830,7 @@ extension ASTGenVisitor {
830830
self.generateLocatedIdentifier($0.name)
831831
}.bridgedArray(in: self)
832832
)
833-
decl.asDecl.setAttrs(attrs.attributes)
833+
decl.asDecl.attrs = attrs.attributes
834834
return decl
835835
}
836836
}

0 commit comments

Comments
 (0)