Skip to content

Commit 2653c16

Browse files
committed
Updating ClassDecl to also accept actor
This patch updates swift-syntax to accept actors in the place of the class keyword. Updates made with: ./swift/utils/build-script --swiftsyntax
1 parent 17a9f7f commit 2653c16

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

Sources/SwiftSyntax/gyb_generated/Misc.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1952,6 +1952,6 @@ extension Syntax {
19521952
extension SyntaxParser {
19531953
static func verifyNodeDeclarationHash() -> Bool {
19541954
return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
1955-
"da7c0141bd1b9360eab92ecfd7c083ae49cd4b1a"
1955+
"20b92b603651f0f0f61d43f86e4c706a8a118216"
19561956
}
19571957
}

Sources/SwiftSyntax/gyb_generated/SyntaxBuilders.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3959,8 +3959,8 @@ public struct ClassDeclSyntaxBuilder {
39593959
}
39603960
}
39613961

3962-
public mutating func useClassKeyword(_ node: TokenSyntax) {
3963-
let idx = ClassDeclSyntax.Cursor.classKeyword.rawValue
3962+
public mutating func useClassOrActorKeyword(_ node: TokenSyntax) {
3963+
let idx = ClassDeclSyntax.Cursor.classOrActorKeyword.rawValue
39643964
layout[idx] = node.raw
39653965
}
39663966

Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,11 +1837,11 @@ public enum SyntaxFactory {
18371837
], length: .zero, presence: .present))
18381838
return TypeInheritanceClauseSyntax(data)
18391839
}
1840-
public static func makeClassDecl(attributes: AttributeListSyntax?, modifiers: ModifierListSyntax?, classKeyword: TokenSyntax, identifier: TokenSyntax, genericParameterClause: GenericParameterClauseSyntax?, inheritanceClause: TypeInheritanceClauseSyntax?, genericWhereClause: GenericWhereClauseSyntax?, members: MemberDeclBlockSyntax) -> ClassDeclSyntax {
1840+
public static func makeClassDecl(attributes: AttributeListSyntax?, modifiers: ModifierListSyntax?, classOrActorKeyword: TokenSyntax, identifier: TokenSyntax, genericParameterClause: GenericParameterClauseSyntax?, inheritanceClause: TypeInheritanceClauseSyntax?, genericWhereClause: GenericWhereClauseSyntax?, members: MemberDeclBlockSyntax) -> ClassDeclSyntax {
18411841
let layout: [RawSyntax?] = [
18421842
attributes?.raw,
18431843
modifiers?.raw,
1844-
classKeyword.raw,
1844+
classOrActorKeyword.raw,
18451845
identifier.raw,
18461846
genericParameterClause?.raw,
18471847
inheritanceClause?.raw,

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxDeclNodes.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@ public struct ClassDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
12951295
enum Cursor: Int {
12961296
case attributes
12971297
case modifiers
1298-
case classKeyword
1298+
case classOrActorKeyword
12991299
case identifier
13001300
case genericParameterClause
13011301
case inheritanceClause
@@ -1406,24 +1406,24 @@ public struct ClassDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
14061406
return ClassDeclSyntax(newData)
14071407
}
14081408

1409-
public var classKeyword: TokenSyntax {
1409+
public var classOrActorKeyword: TokenSyntax {
14101410
get {
1411-
let childData = data.child(at: Cursor.classKeyword,
1411+
let childData = data.child(at: Cursor.classOrActorKeyword,
14121412
parent: Syntax(self))
14131413
return TokenSyntax(childData!)
14141414
}
14151415
set(value) {
1416-
self = withClassKeyword(value)
1416+
self = withClassOrActorKeyword(value)
14171417
}
14181418
}
14191419

1420-
/// Returns a copy of the receiver with its `classKeyword` replaced.
1421-
/// - param newChild: The new `classKeyword` to replace the node's
1422-
/// current `classKeyword`, if present.
1423-
public func withClassKeyword(
1420+
/// Returns a copy of the receiver with its `classOrActorKeyword` replaced.
1421+
/// - param newChild: The new `classOrActorKeyword` to replace the node's
1422+
/// current `classOrActorKeyword`, if present.
1423+
public func withClassOrActorKeyword(
14241424
_ newChild: TokenSyntax?) -> ClassDeclSyntax {
14251425
let raw = newChild?.raw ?? RawSyntax.missingToken(TokenKind.classKeyword)
1426-
let newData = data.replacingChild(raw, at: Cursor.classKeyword)
1426+
let newData = data.replacingChild(raw, at: Cursor.classOrActorKeyword)
14271427
return ClassDeclSyntax(newData)
14281428
}
14291429

@@ -1614,7 +1614,7 @@ extension ClassDeclSyntax: CustomReflectable {
16141614
return Mirror(self, children: [
16151615
"attributes": attributes.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
16161616
"modifiers": modifiers.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
1617-
"classKeyword": Syntax(classKeyword).asProtocol(SyntaxProtocol.self),
1617+
"classOrActorKeyword": Syntax(classOrActorKeyword).asProtocol(SyntaxProtocol.self),
16181618
"identifier": Syntax(identifier).asProtocol(SyntaxProtocol.self),
16191619
"genericParameterClause": genericParameterClause.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
16201620
"inheritanceClause": inheritanceClause.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,

0 commit comments

Comments
 (0)