From b29f142f189f0cfbe86f3e5e5728015b301fc35c Mon Sep 17 00:00:00 2001 From: Kim de Vos Date: Sun, 19 Mar 2023 11:04:02 +0100 Subject: [PATCH 1/2] Update swift syntax --- CodeGeneration/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodeGeneration/Package.swift b/CodeGeneration/Package.swift index 5555fc23ca1..e722f6b4834 100644 --- a/CodeGeneration/Package.swift +++ b/CodeGeneration/Package.swift @@ -11,7 +11,7 @@ let package = Package( .executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"]) ], dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", revision: "94b9021a2e461fc9a4b3bda6f4734119b52e8094"), + .package(url: "https://github.com/apple/swift-syntax.git", revision: "55349f8019fb129781af3f988011b20b66989664"), .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")), ], targets: [ From 229d9bf332ee859d3accb08b97a59834e7b89ef8 Mon Sep 17 00:00:00 2001 From: Kim de Vos Date: Fri, 24 Mar 2023 21:25:31 +0100 Subject: [PATCH 2/2] Update Package.swift --- CodeGeneration/Package.swift | 2 +- .../generated/raw/RawSyntaxValidation.swift | 42 +++++++------------ 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/CodeGeneration/Package.swift b/CodeGeneration/Package.swift index e722f6b4834..b0e19b463be 100644 --- a/CodeGeneration/Package.swift +++ b/CodeGeneration/Package.swift @@ -11,7 +11,7 @@ let package = Package( .executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"]) ], dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", revision: "55349f8019fb129781af3f988011b20b66989664"), + .package(url: "https://github.com/apple/swift-syntax.git", revision: "39b3336c3f3bfcd4ddbcbf6a111d8814ffe542f3"), .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")), ], targets: [ diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift index c7650de416a..ed433c724bb 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift @@ -227,12 +227,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { case .accessPathComponent: assert(layout.count == 5) assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [ - .tokenKind(.identifier), - .tokenKind(.binaryOperator), - .tokenKind(.prefixOperator), - .tokenKind(.postfixOperator) - ])) + assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier)])) assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self)) assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.period)])) assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self)) @@ -835,13 +830,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { case .declName: assert(layout.count == 5) assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [ - .tokenKind(.identifier), - .tokenKind(.binaryOperator), - .keyword("init"), - .keyword("self"), - .keyword("Self") - ])) + assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier), .tokenKind(.prefixOperator), .keyword("init")])) assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self)) assertNoError(kind, 3, verify(layout[3], as: RawDeclNameArgumentsSyntax?.self)) assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self)) @@ -962,7 +951,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { case .differentiableAttributeArguments: assert(layout.count == 11) assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.keyword("_forward"), .keyword("reverse"), .keyword("_linear")])) + assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.keyword("forward"), .keyword("reverse"), .keyword("linear")])) assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self)) assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.comma)])) assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self)) @@ -1019,12 +1008,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { case .editorPlaceholderExpr: assert(layout.count == 3) assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [ - .tokenKind(.identifier), - .keyword("self"), - .keyword("Self"), - .keyword("init") - ])) + assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier)])) assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self)) case .effectsArguments: for (index, element) in layout.enumerated() { @@ -1561,7 +1545,14 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { case .labeledSpecializeEntry: assert(layout.count == 9) assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self)) + assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [ + .tokenKind(.identifier), + .keyword("available"), + .keyword("exported"), + .keyword("kind"), + .keyword("spi"), + .keyword("spiModule") + ])) assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self)) assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.colon)])) assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self)) @@ -1786,7 +1777,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { case .objCSelectorPiece: assert(layout.count == 5) assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self)) + assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.identifier)])) assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self)) assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.colon)])) assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self)) @@ -2077,10 +2068,9 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self)) assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax.self, tokenChoices: [ .tokenKind(.identifier), - .keyword("self"), - .keyword("Self"), - .keyword("init"), - .tokenKind(.binaryOperator) + .tokenKind(.binaryOperator), + .tokenKind(.prefixOperator), + .tokenKind(.postfixOperator) ])) assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self)) assertNoError(kind, 7, verify(layout[7], as: RawDeclNameArgumentsSyntax?.self))