8000 Merge pull request #445 from bnbarham/cherry-async-syntax · swiftlang/swift-syntax@79d1e52 · GitHub
[go: up one dir, main page]
Skip to content

Commit 79d1e52

Browse files
bnbarhambnbarham
authored
Merge pull request #445 from bnbarham/cherry-async-syntax
[5.7] Update gyb after updating async to contextual keyword
2 parents 0423e4d + 0064d82 commit 79d1e52

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

‎Sources/SwiftSyntax/gyb_generated/SyntaxClassification.swift

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,14 @@ extension SyntaxClassification {
6767
switch (parentKind, indexInParent) {
6868
case (.awaitExpr, 0):
6969
return (.keyword, false)
70-
case (.arrowExpr, 0):
71-
return (.keyword, false)
72-
case (.closureSignature, 3):
73-
return (.keyword, false)
7470
case (.expressionSegment, 2):
7571
return (.stringInterpolationAnchor, true)
76-
case (.functionSignature, 1):
77-
return (.keyword, false)
7872
case (.ifConfigClause, 0):
7973
return (.buildConfigId, false)
8074
case (.ifConfigDecl, 1):
8175
return (.buildConfigId, false)
8276
case (.declModifier, 0):
8377
return (.attribute, false)
84-
case (.accessorDecl, 4):
85-
return (.keyword, false)
8678
case (.precedenceGroupRelation, 0):
8779
return (.keyword, false)
8880
case (.precedenceGroupAssociativity, 0):
@@ -97,8 +89,6 @@ extension SyntaxClassification {
9789
return (.typeIdentifier, false)
9890
case (.constrainedSugarType, 0):
9991
return (.keyword, false)
100-
case (.functionType, 3):
101-
return (.keyword, false)
10292
case (.availabilityVersionRestriction, 0):
10393
return (.keyword, false)
10494
default: return nil

‎Sources/SwiftSyntaxBuilder/gyb_generated/BuildableNodes.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,7 @@ public struct ArrowExpr: ExprBuildable, ExpressibleAsArrowExpr {
13151315
arrowToken: TokenSyntax = TokenSyntax.`arrow`
13161316
) {
13171317
self.init(
1318-
asyncKeyword: asyncKeyword.map(TokenSyntax.identifier),
1318+
asyncKeyword: asyncKeyword.map(TokenSyntax.contextualKeyword),
13191319
throwsToken: throwsToken,
13201320
arrowToken: arrowToken
13211321
)
@@ -2464,7 +2464,7 @@ public struct ClosureSignature: SyntaxBuildable, ExpressibleAsClosureSignature {
24642464
attributes: attributesBuilder(),
24652465
capture: capture,
24662466
input: input,
2467-
asyncKeyword: asyncKeyword.map(TokenSyntax.identifier),
2467+
asyncKeyword: asyncKeyword.map(TokenSyntax.contextualKeyword),
24682468
throwsTok: throwsTok,
24692469
output: output,
24702470
inTok: inTok
@@ -4356,7 +4356,7 @@ public struct FunctionSignature: SyntaxBuildable, ExpressibleAsFunctionSignature
43564356
) {
43574357
self.init(
43584358
input: input,
4359-
asyncOrReasyncKeyword: asyncOrReasyncKeyword.map(TokenSyntax.identifier),
4359+
asyncOrReasyncKeyword: asyncOrReasyncKeyword.map(TokenSyntax.contextualKeyword),
43604360
throwsOrRethrowsKeyword: throwsOrRethrowsKeyword,
43614361
output: output
43624362
)
@@ -6533,7 +6533,7 @@ public struct AccessorDecl: DeclBuildable, ExpressibleAsAccessorDecl {
65336533
modifier: modifier,
65346534
accessorKind: accessorKind,
65356535
parameter: parameter,
6536-
asyncKeyword: asyncKeyword.map(TokenSyntax.identifier),
6536+
asyncKeyword: asyncKeyword.map(TokenSyntax.contextualKeyword),
65376537
throwsKeyword: throwsKeyword,
65386538
body: body
65396539
)
@@ -12433,7 +12433,7 @@ public struct FunctionType: TypeBuildable, ExpressibleAsFunctionType {
1243312433
public init(
1243412434
leftParen: TokenSyntax = TokenSyntax.`leftParen`,
1243512435
rightParen: TokenSyntax = TokenSyntax.`rightParen`,
12436-
asyncKeyword: String?,
12436+
asyncKeyword: TokenSyntax? = nil,
1243712437
throwsOrRethrowsKeyword: TokenSyntax? = nil,
1243812438
arrow: TokenSyntax = TokenSyntax.`arrow`,
1243912439
returnType: ExpressibleAsTypeBuildable,
@@ -12443,7 +12443,7 @@ public struct FunctionType: TypeBuildable, ExpressibleAsFunctionType {
1244312443
leftParen: leftParen,
1244412444
arguments: argumentsBuilder(),
1244512445
rightParen: rightParen,
12446-
asyncKeyword: asyncKeyword.map(TokenSyntax.identifier),
12446+
asyncKeyword: asyncKeyword,
1244712447
throwsOrRethrowsKeyword: throwsOrRethrowsKeyword,
1244812448
arrow: arrow,
1244912449
returnType: returnType

‎Sources/SwiftSyntaxParser/gyb_generated/NodeDeclarationHash.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
extension SyntaxParser {
1818
static func verifyNodeDeclarationHash() -> Bool {
1919
return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
20-
"9adb90dde0ca797a8bd9be567fefc6f4e027c3a5"
20+
"2ec3f7586996f875c3cb1e71ed98e0551f0ec8e7"
2121
}
2222
}

0 commit comments

Comments
 (0)
0