Skip to content

Commit 74c544e

Browse files
authored
Merge pull request #1422 from kimdv/kimdv/fix-warning
Fix warning in code gen
2 parents f296bc8 + 229d9bf commit 74c544e

File tree

2 files changed

+17
-27
lines changed

2 files changed

+17
-27
lines changed

CodeGeneration/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let package = Package(
1111
.executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"])
1212
],
1313
dependencies: [
14-
.package(url: "https://github.com/apple/swift-syntax.git", revision: "94b9021a2e461fc9a4b3bda6f4734119b52e8094"),
14+
.package(url: "https://github.com/apple/swift-syntax.git", revision: "39b3336c3f3bfcd4ddbcbf6a111d8814ffe542f3"),
1515
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")),
1616
],
1717
targets: [

Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
227227
case .accessPathComponent:
228228
assert(layout.count == 5)
229229
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
230-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [
231-
.tokenKind(.identifier),
232-
.tokenKind(.binaryOperator),
233-
.tokenKind(.prefixOperator),
234-
.tokenKind(.postfixOperator)
235-
]))
230+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier)]))
236231
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
237232
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.period)]))
238233
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -835,13 +830,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
835830
case .declName:
836831
assert(layout.count == 5)
837832
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
838-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [
839-
.tokenKind(.identifier),
840-
.tokenKind(.binaryOperator),
841-
.keyword("init"),
842-
.keyword("self"),
843-
.keyword("Self")
844-
]))
833+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier), .tokenKind(.prefixOperator), .keyword("init")]))
845834
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
846835
assertNoError(kind, 3, verify(layout[3], as: RawDeclNameArgumentsSyntax?.self))
847836
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -962,7 +951,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
962951
case .differentiableAttributeArguments:
963952
assert(layout.count == 11)
964953
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
965-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.keyword("_forward"), .keyword("reverse"), .keyword("_linear")]))
954+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.keyword("forward"), .keyword("reverse"), .keyword("linear")]))
966955
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
967956
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.comma)]))
968957
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -1019,12 +1008,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
10191008
case .editorPlaceholderExpr:
10201009
assert(layout.count == 3)
10211010
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
1022-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [
1023-
.tokenKind(.identifier),
1024-
.keyword("self"),
1025-
.keyword("Self"),
1026-
.keyword("init")
1027-
]))
1011+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier)]))
10281012
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
10291013
case .effectsArguments:
10301014
for (index, element) in layout.enumerated() {
@@ -1561,7 +1545,14 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
15611545
case .labeledSpecializeEntry:
15621546
assert(layout.count == 9)
15631547
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
1564-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self))
1548+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [
1549+
.tokenKind(.identifier),
1550+
.keyword("available"),
1551+
.keyword("exported"),
1552+
.keyword("kind"),
1553+
.keyword("spi"),
1554+
.keyword("spiModule")
1555+
]))
15651556
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
15661557
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.colon)]))
15671558
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -1785,7 +1776,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
17851776
case .objCSelectorPiece:
17861777
assert(layout.count == 5)
17871778
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
1788-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self))
1779+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.identifier)]))
17891780
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
17901781
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.colon)]))
17911782
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -2076,10 +2067,9 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
20762067
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
20772068
assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax.self, tokenChoices: [
20782069
.tokenKind(.identifier),
2079-
.keyword("self"),
2080-
.keyword("Self"),
2081-
.keyword("init"),
2082-
.tokenKind(.binaryOperator)
2070+
.tokenKind(.binaryOperator),
2071+
.tokenKind(.prefixOperator),
2072+
.tokenKind(.postfixOperator)
20832073
]))
20842074
assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self))
20852075
assertNoError(kind, 7, verify(layout[7], as: RawDeclNameArgumentsSyntax?.self))

0 commit comments

Comments
 (0)