From 40f39d69621f6da1a5d0d790b3d9022c411b37f7 Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Mon, 24 Mar 2025 10:15:07 -0700 Subject: [PATCH 1/2] [Syntax] Remove unnecessary special attribute arguments syntax kinds Some attributes are expressed with the regular 'LabeledExprListSyntax' There's no need for special argument list syntax kind and keywords. --- .../SyntaxSupport/AttributeNodes.swift | 193 +-------- .../Sources/SyntaxSupport/KeywordSpec.swift | 57 --- .../SyntaxSupport/SyntaxNodeKind.swift | 7 - .../ValidateSyntaxNodes.swift | 8 - Sources/SwiftParser/Attributes.swift | 232 ----------- Sources/SwiftParser/TokenPrecedence.swift | 21 +- Sources/SwiftParser/Types.swift | 10 +- .../ParseDiagnosticsGenerator.swift | 55 --- .../SyntaxKindNameForDiagnostics.swift | 12 - .../generated/SwiftSyntax.md | 6 - .../generated/ChildNameForKeyPath.swift | 92 ----- Sources/SwiftSyntax/generated/Keyword.swift | 86 ---- .../generated/RenamedNodesCompatibility.swift | 8 - .../generated/SyntaxAnyVisitor.swift | 48 --- .../generated/SyntaxBaseNodes.swift | 6 - .../SwiftSyntax/generated/SyntaxEnum.swift | 18 - .../SwiftSyntax/generated/SyntaxKind.swift | 18 - .../generated/SyntaxRewriter.swift | 96 ----- .../SwiftSyntax/generated/SyntaxVisitor.swift | 144 ------- .../generated/raw/RawSyntaxNodesAB.swift | 42 +- .../generated/raw/RawSyntaxNodesC.swift | 188 --------- .../generated/raw/RawSyntaxNodesEF.swift | 82 ---- .../generated/raw/RawSyntaxNodesOP.swift | 82 ---- .../generated/raw/RawSyntaxNodesTUVWXYZ.swift | 164 -------- .../generated/raw/RawSyntaxValidation.swift | 76 ---- .../generated/syntaxNodes/SyntaxNodesAB.swift | 258 +----------- .../generated/syntaxNodes/SyntaxNodesC.swift | 381 ------------------ .../generated/syntaxNodes/SyntaxNodesEF.swift | 150 ------- .../generated/syntaxNodes/SyntaxNodesOP.swift | 158 -------- .../syntaxNodes/SyntaxNodesQRS.swift | 6 - .../syntaxNodes/SyntaxNodesTUVWXYZ.swift | 306 -------------- Tests/SwiftParserTest/AttributeTests.swift | 85 +--- 32 files changed, 36 insertions(+), 3059 deletions(-) diff --git a/CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift b/CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift index a92cb990b9e..26041a0cf89 100644 --- a/CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift +++ b/CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift @@ -61,86 +61,67 @@ public let ATTRIBUTE_NODES: [Node] = [ kind: .nodeChoices(choices: [ Child( name: "argumentList", + // Regular function-like attribute arguments. kind: .node(kind: .labeledExprList) ), - Child( - name: "token", - kind: .node(kind: .token) - ), - Child( - name: "string", - kind: .node(kind: .stringLiteralExpr) - ), Child( name: "availability", + // Special arguments for platform versions. kind: .node(kind: .availabilityArgumentList) ), Child( name: "specializeArguments", + // Special arguments for keyword decl name e.g. 'subscript(_:)', and availability arguments. kind: .node(kind: .specializeAttributeArgumentList) ), Child( name: "objCName", + // Special arguments for Objective-C names. e.g. 'methodNameWithArg1:Arg2:' kind: .node(kind: .objCSelectorPieceList) ), Child( name: "implementsArguments", + // Special arguments for keyword decl name e.g. 'subscript(_:)'. kind: .node(kind: .implementsAttributeArguments) ), Child( name: "differentiableArguments", + // Special arguments for 'where' clause. kind: .node(kind: .differentiableAttributeArguments) ), Child( name: "derivativeRegistrationArguments", + // Special arguments for 'where' clause. kind: .node(kind: .derivativeAttributeArguments) ), Child( name: "backDeployedArguments", + // Special arguments for platform versions. kind: .node(kind: .backDeployedAttributeArguments) ), - Child( - name: "conventionArguments", - kind: .node(kind: .conventionAttributeArguments) - ), - Child( - name: "conventionWitnessMethodArguments", - kind: .node(kind: .conventionWitnessMethodAttributeArguments) - ), - Child( - name: "opaqueReturnTypeOfAttributeArguments", - kind: .node(kind: .opaqueReturnTypeOfAttributeArguments) - ), - Child( - name: "exposeAttributeArguments", - kind: .node(kind: .exposeAttributeArguments) - ), Child( name: "originallyDefinedInArguments", + // Special arguments for platform versions. kind: .node(kind: .originallyDefinedInAttributeArguments) ), - Child( - name: "underscorePrivateAttributeArguments", - kind: .node(kind: .underscorePrivateAttributeArguments) - ), Child( name: "dynamicReplacementArguments", + // Special arguments for keyword decl name e.g. 'subscript(_:)'. kind: .node(kind: .dynamicReplacementAttributeArguments) ), - Child( - name: "unavailableFromAsyncArguments", - kind: .node(kind: .unavailableFromAsyncAttributeArguments) - ), Child( name: "effectsArguments", + // Special arguments for arbitrary token list, processed in SIL. kind: .node(kind: .effectsAttributeArgumentList) ), Child( name: "documentationArguments", + // Special arguments for access-level keywords. E.g. 'private'. kind: .node(kind: .documentationAttributeArgumentList) ), Child( name: "abiArguments", + // Special arguments for declaration syntax. e.g. @abi(func abiName() -> Int) kind: .node(kind: .abiAttributeArguments), experimentalFeature: .abiAttribute ), @@ -296,65 +277,6 @@ public let ATTRIBUTE_NODES: [Node] = [ ] ), - Node( - kind: .conventionAttributeArguments, - base: .syntax, - nameForDiagnostics: "@convention(...) arguments", - documentation: "The arguments for the '@convention(...)'.", - children: [ - Child( - name: "conventionLabel", - kind: .token(choices: [.token(.identifier)]), - documentation: "The convention label." - ), - Child( - name: "comma", - kind: .token(choices: [.token(.comma)]), - isOptional: true - ), - Child( - name: "cTypeLabel", - kind: .token(choices: [.keyword(.cType)]), - isOptional: true - ), - Child( - name: "colon", - kind: .token(choices: [.token(.colon)]), - isOptional: true - ), - Child( - name: "cTypeString", - kind: .node(kind: .stringLiteralExpr), - isOptional: true - ), - ] - ), - - Node( - kind: .conventionWitnessMethodAttributeArguments, - base: .syntax, - nameForDiagnostics: "@convention(...) arguments for witness methods", - documentation: "The arguments for the '@convention(witness_method: ...)'.", - children: [ - Child( - name: "witnessMethodLabel", - kind: .token(choices: [.keyword(.witness_method)]), - documentation: #"The `witnessMethod` label."# - ), - Child( - name: "colon", - kind: .token(choices: [.token(.colon)]), - documentation: #"The colon separating the `witnessMethod` label and the original protocol name."# - - ), - Child( - name: "protocolName", - kind: .token(choices: [.token(.identifier)]), - documentation: "The original protocol name." - ), - ] - ), - Node( kind: .derivativeAttributeArguments, base: .syntax, @@ -653,29 +575,6 @@ public let ATTRIBUTE_NODES: [Node] = [ elementChoices: [.token] ), - Node( - kind: .exposeAttributeArguments, - base: .syntax, - nameForDiagnostics: "@_expose arguments", - documentation: "The arguments for the '@_expose' attribute", - children: [ - Child( - name: "language", - kind: .node(kind: .token) - ), - Child( - name: "comma", - kind: .token(choices: [.token(.comma)]), - isOptional: true - ), - Child( - name: "cxxName", - kind: .node(kind: .stringLiteralExpr), - isOptional: true - ), - ] - ), - Node( kind: .implementsAttributeArguments, base: .syntax, @@ -780,29 +679,6 @@ public let ATTRIBUTE_NODES: [Node] = [ elementChoices: [.objCSelectorPiece] ), - Node( - kind: .opaqueReturnTypeOfAttributeArguments, - base: .syntax, - nameForDiagnostics: "opaque return type arguments", - documentation: "The arguments for the '@_opaqueReturnTypeOf()'.", - children: [ - Child( - name: "mangledName", - kind: .node(kind: .stringLiteralExpr), - documentation: "The mangled name of a declaration." - ), - Child( - name: "comma", - kind: .token(choices: [.token(.comma)]) - ), - Child( - name: "ordinal", - kind: .token(choices: [.token(.integerLiteral)]), - documentation: "The ordinal corresponding to the 'some' keyword that introduced this opaque type." - ), - ] - ), - Node( kind: .originallyDefinedInAttributeArguments, base: .syntax, @@ -884,47 +760,4 @@ public let ATTRIBUTE_NODES: [Node] = [ ] ] ), - - Node( - kind: .unavailableFromAsyncAttributeArguments, - base: .syntax, - nameForDiagnostics: "@_unavailableFromAsync argument", - documentation: "The arguments for the '@_unavailableFromAsync' attribute", - children: [ - Child( - name: "messageLabel", - kind: .token(choices: [.keyword(.message)]) - ), - Child( - name: "colon", - kind: .token(choices: [.token(.colon)]) - ), - Child( - name: "message", - kind: .node(kind: .stringLiteralExpr) - ), - ] - ), - - Node( - kind: .underscorePrivateAttributeArguments, - base: .syntax, - nameForDiagnostics: "@_private argument", - documentation: "The arguments for the '@_private' attribute", - children: [ - Child( - name: "sourceFileLabel", - kind: .token(choices: [.keyword(.sourceFile)]) - ), - Child( - name: "colon", - kind: .token(choices: [.token(.colon)]) - ), - Child( - name: "filename", - kind: .node(kind: .stringLiteralExpr) - ), - ] - ), - ] diff --git a/CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift b/CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift index 33cbefca7af..2cf01f217b0 100644 --- a/CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift +++ b/CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift @@ -78,12 +78,10 @@ public enum Keyword: CaseIterable { case __owned case __setter_access case __shared - case _alignment case _backDeploy case _borrow case _borrowing case _BridgeObject - case _cdecl case _Class case _compilerInitialized case _const @@ -91,7 +89,6 @@ public enum Keyword: CaseIterable { case _documentation case _dynamicReplacement case _effects - case _expose case _forward case _implements case _linear @@ -102,27 +99,16 @@ public enum Keyword: CaseIterable { case _NativeClass case _NativeRefCountedObject case _noMetadata - case _nonSendable - case _objcImplementation - case _objcRuntimeName case _opaqueReturnTypeOf - case _optimize case _originallyDefinedIn case _PackageDescription - case _private - case _projectedValueProperty case _read case _RefCountedObject - case _semantics case _specialize - case _spi case _spi_available - case _swift_native_objc_runtime_base case _Trivial case _TrivialAtMost case _TrivialStride - case _typeEraser - case _unavailableFromAsync case _underlyingVersion case _UnknownLayout case _version @@ -160,7 +146,6 @@ public enum Keyword: CaseIterable { case `continue` case convenience case convention - case cType case `default` case `defer` case `deinit` @@ -176,7 +161,6 @@ public enum Keyword: CaseIterable { case `else` case `enum` case escaping - case exclusivity case exported case `extension` case `fallthrough` @@ -199,7 +183,6 @@ public enum Keyword: CaseIterable { case infix case `init` case initializes - case inline case `inout` case `internal` case introduced @@ -261,7 +244,6 @@ public enum Keyword: CaseIterable { case Sendable case set case some - case sourceFile case spi case spiModule case `static` @@ -291,7 +273,6 @@ public enum Keyword: CaseIterable { case `where` case `while` case willSet - case witness_method case wrt case x case yield @@ -306,8 +287,6 @@ public enum Keyword: CaseIterable { return KeywordSpec("__setter_access") case .__shared: return KeywordSpec("__shared") - case ._alignment: - return KeywordSpec("_alignment") case ._backDeploy: return KeywordSpec("_backDeploy") case ._borrow: @@ -316,8 +295,6 @@ public enum Keyword: CaseIterable { return KeywordSpec("_borrowing") case ._BridgeObject: return KeywordSpec("_BridgeObject") - case ._cdecl: - return KeywordSpec("_cdecl") case ._Class: return KeywordSpec("_Class") case ._compilerInitialized: @@ -332,8 +309,6 @@ public enum Keyword: CaseIterable { return KeywordSpec("_dynamicReplacement") case ._effects: return KeywordSpec("_effects") - case ._expose: - return KeywordSpec("_expose") case ._forward: return KeywordSpec("_forward") case ._implements: @@ -354,48 +329,26 @@ public enum Keyword: CaseIterable { return KeywordSpec("_NativeRefCountedObject") case ._noMetadata: return KeywordSpec("_noMetadata") - case ._nonSendable: - return KeywordSpec("_nonSendable") - case ._objcImplementation: - return KeywordSpec("_objcImplementation") - case ._objcRuntimeName: - return KeywordSpec("_objcRuntimeName") case ._opaqueReturnTypeOf: return KeywordSpec("_opaqueReturnTypeOf") - case ._optimize: - return KeywordSpec("_optimize") case ._originallyDefinedIn: return KeywordSpec("_originallyDefinedIn") case ._PackageDescription: return KeywordSpec("_PackageDescription") - case ._private: - return KeywordSpec("_private") - case ._projectedValueProperty: - return KeywordSpec("_projectedValueProperty") case ._read: return KeywordSpec("_read") case ._RefCountedObject: return KeywordSpec("_RefCountedObject") - case ._semantics: - return KeywordSpec("_semantics") case ._specialize: return KeywordSpec("_specialize") - case ._spi: - return KeywordSpec("_spi") case ._spi_available: return KeywordSpec("_spi_available") - case ._swift_native_objc_runtime_base: - return KeywordSpec("_swift_native_objc_runtime_base") case ._Trivial: return KeywordSpec("_Trivial") case ._TrivialAtMost: return KeywordSpec("_TrivialAtMost") case ._TrivialStride: return KeywordSpec("_TrivialStride") - case ._typeEraser: - return KeywordSpec("_typeEraser") - case ._unavailableFromAsync: - return KeywordSpec("_unavailableFromAsync") case ._underlyingVersion: return KeywordSpec("_underlyingVersion") case ._UnknownLayout: @@ -470,8 +423,6 @@ public enum Keyword: CaseIterable { return KeywordSpec("convenience") case .convention: return KeywordSpec("convention") - case .cType: - return KeywordSpec("cType") case .default: return KeywordSpec("default", isLexerClassified: true) case .defer: @@ -502,8 +453,6 @@ public enum Keyword: CaseIterable { return KeywordSpec("enum", isLexerClassified: true) case .escaping: return KeywordSpec("escaping") - case .exclusivity: - return KeywordSpec("exclusivity") case .exported: return KeywordSpec("exported") case .extension: @@ -548,8 +497,6 @@ public enum Keyword: CaseIterable { return KeywordSpec("init", isLexerClassified: true) case .initializes: return KeywordSpec("initializes") - case .inline: - return KeywordSpec("inline") case .inout: return KeywordSpec("inout", isLexerClassified: true) case .internal: @@ -668,8 +615,6 @@ public enum Keyword: CaseIterable { return KeywordSpec("set") case .some: return KeywordSpec("some") - case .sourceFile: - return KeywordSpec("sourceFile") case .spi: return KeywordSpec("spi") case .spiModule: @@ -732,8 +677,6 @@ public enum Keyword: CaseIterable { return KeywordSpec("while", isLexerClassified: true) case .willSet: return KeywordSpec("willSet") - case .witness_method: - return KeywordSpec("witness_method") case .wrt: return KeywordSpec("wrt") case .x: diff --git a/CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift b/CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift index e4d0407204f..ab07a05f470 100644 --- a/CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift +++ b/CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift @@ -82,8 +82,6 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon case conformanceRequirement case consumeExpr case continueStmt - case conventionAttributeArguments - case conventionWitnessMethodAttributeArguments case copyExpr case decl case declModifier @@ -125,7 +123,6 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon case enumCaseParameterClause case enumCaseParameterList case enumDecl - case exposeAttributeArguments case expr case expressionPattern case expressionSegment @@ -215,7 +212,6 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon case nilLiteralExpr case objCSelectorPiece case objCSelectorPieceList - case opaqueReturnTypeOfAttributeArguments case operatorDecl case operatorPrecedenceAndTypes case optionalBindingCondition @@ -300,8 +296,6 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon case typeSpecifier case lifetimeSpecifierArguments case typeSpecifierList - case unavailableFromAsyncAttributeArguments - case underscorePrivateAttributeArguments case unexpectedNodes case unresolvedAsExpr case unresolvedIsExpr @@ -465,7 +459,6 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon case .switchCaseItem: return "caseItem" case .switchCaseItemList: return "caseItemList" case .typeAliasDecl: return "typealiasDecl" - case .unavailableFromAsyncAttributeArguments: return "unavailableFromAsyncArguments" case .yieldedExpression: return "yieldExprListElement" case .yieldedExpressionList: return "yieldExprList" case .yieldedExpressionsClause: return "yieldList" diff --git a/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift b/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift index dc3219f7a95..d2eceb9334f 100644 --- a/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift +++ b/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift @@ -336,14 +336,6 @@ class ValidateSyntaxNodes: XCTestCase { "child 'pounds' has a token as its only token choice and should thus be named 'rawStringPoundDelimiter'" ), - // MARK: Tokens that contain underscores - ValidationFailure( - node: .conventionWitnessMethodAttributeArguments, - message: - "child 'witnessMethodLabel' has a single keyword as its only token choice and is followed by a colon. It should thus be named 'witness_methodLabel'" - // Witness_method has an underscore and thus WitnessMethod is the correct spelling - ), - // MARK: Repeat node type name // If the node is named the same as the token, we don't need to repeat the entire token name ValidationFailure( diff --git a/Sources/SwiftParser/Attributes.swift b/Sources/SwiftParser/Attributes.swift index ec8fa856042..72af60d312c 100644 --- a/Sources/SwiftParser/Attributes.swift +++ b/Sources/SwiftParser/Attributes.swift @@ -35,28 +35,14 @@ extension Parser { extension Parser { /// Compiler-known attributes that take arguments. enum DeclarationAttributeWithSpecialSyntax: TokenSpecSet { - case _alignment case _backDeploy - case _cdecl case _documentation case _dynamicReplacement case _effects - case _expose case _implements - case _nonSendable - case _objcImplementation - case _objcRuntimeName - case _optimize case _originallyDefinedIn - case _private - case _projectedValueProperty - case _semantics case _specialize - case _spi case _spi_available - case _swift_native_objc_runtime_base - case _typeEraser - case _unavailableFromAsync case `rethrows` case abi case attached @@ -64,37 +50,21 @@ extension Parser { case backDeployed case derivative case differentiable - case exclusivity case freestanding - case inline case objc case Sendable case transpose init?(lexeme: Lexer.Lexeme, experimentalFeatures: Parser.ExperimentalFeatures) { switch PrepareForKeywordMatch(lexeme) { - case TokenSpec(._alignment): self = ._alignment case TokenSpec(._backDeploy): self = ._backDeploy - case TokenSpec(._cdecl): self = ._cdecl case TokenSpec(._documentation): self = ._documentation case TokenSpec(._dynamicReplacement): self = ._dynamicReplacement case TokenSpec(._effects): self = ._effects - case TokenSpec(._expose): self = ._expose case TokenSpec(._implements): self = ._implements - case TokenSpec(._nonSendable): self = ._nonSendable - case TokenSpec(._objcImplementation): self = ._objcImplementation - case TokenSpec(._objcRuntimeName): self = ._objcRuntimeName - case TokenSpec(._optimize): self = ._optimize case TokenSpec(._originallyDefinedIn): self = ._originallyDefinedIn - case TokenSpec(._private): self = ._private - case TokenSpec(._projectedValueProperty): self = ._projectedValueProperty - case TokenSpec(._semantics): self = ._semantics case TokenSpec(._specialize): self = ._specialize - case TokenSpec(._spi): self = ._spi case TokenSpec(._spi_available): self = ._spi_available - case TokenSpec(._swift_native_objc_runtime_base): self = ._swift_native_objc_runtime_base - case TokenSpec(._typeEraser): self = ._typeEraser - case TokenSpec(._unavailableFromAsync): self = ._unavailableFromAsync case TokenSpec(.`rethrows`): self = .rethrows case TokenSpec(.abi) where experimentalFeatures.contains(.abiAttribute): self = .abi case TokenSpec(.attached): self = .attached @@ -102,9 +72,7 @@ extension Parser { case TokenSpec(.backDeployed): self = .backDeployed case TokenSpec(.derivative): self = .derivative case TokenSpec(.differentiable): self = .differentiable - case TokenSpec(.exclusivity): self = .exclusivity case TokenSpec(.freestanding): self = .freestanding - case TokenSpec(.inline): self = .inline case TokenSpec(.objc): self = .objc case TokenSpec(.Sendable): self = .Sendable case TokenSpec(.transpose): self = .transpose @@ -115,28 +83,14 @@ extension Parser { var spec: TokenSpec { switch self { - case ._alignment: return .keyword(._alignment) case ._backDeploy: return .keyword(._backDeploy) - case ._cdecl: return .keyword(._cdecl) case ._documentation: return .keyword(._documentation) case ._dynamicReplacement: return .keyword(._dynamicReplacement) case ._effects: return .keyword(._effects) - case ._expose: return .keyword(._expose) case ._implements: return .keyword(._implements) - case ._nonSendable: return .keyword(._nonSendable) - case ._objcImplementation: return .keyword(._objcImplementation) - case ._objcRuntimeName: return .keyword(._objcRuntimeName) - case ._optimize: return .keyword(._optimize) case ._originallyDefinedIn: return .keyword(._originallyDefinedIn) - case ._private: return .keyword(._private) - case ._projectedValueProperty: return .keyword(._projectedValueProperty) - case ._semantics: return .keyword(._semantics) case ._specialize: return .keyword(._specialize) - case ._spi: return .keyword(._spi) case ._spi_available: return .keyword(._spi_available) - case ._swift_native_objc_runtime_base: return .keyword(._swift_native_objc_runtime_base) - case ._typeEraser: return .keyword(._typeEraser) - case ._unavailableFromAsync: return .keyword(._unavailableFromAsync) case .`rethrows`: return .keyword(.rethrows) case .abi: return .keyword(.abi) case .attached: return .keyword(.attached) @@ -144,9 +98,7 @@ extension Parser { case .backDeployed: return .keyword(.backDeployed) case .derivative: return .keyword(.derivative) case .differentiable: return .keyword(.differentiable) - case .exclusivity: return .keyword(.exclusivity) case .freestanding: return .keyword(.freestanding) - case .inline: return .keyword(.inline) case .objc: return .keyword(.objc) case .Sendable: return .keyword(.Sendable) case .transpose: return .keyword(.transpose) @@ -300,10 +252,6 @@ extension Parser { return parseAttribute(argumentMode: .required) { parser in return .specializeArguments(parser.parseSpecializeAttributeArgumentList()) } - case ._private: - return parseAttribute(argumentMode: .required) { parser in - return .underscorePrivateAttributeArguments(parser.parseUnderscorePrivateAttributeArguments()) - } case ._dynamicReplacement: return parseAttribute(argumentMode: .required) { parser in return .dynamicReplacementArguments(parser.parseDynamicReplacementAttributeArguments()) @@ -312,29 +260,6 @@ extension Parser { return parseAttribute(argumentMode: .required) { parser in return .documentationArguments(parser.parseDocumentationAttributeArguments()) } - case ._spi, ._objcRuntimeName, ._projectedValueProperty, ._swift_native_objc_runtime_base, ._typeEraser, ._optimize, - .exclusivity, .inline, ._alignment: - // Attributes that take a single token as argument. Some examples of these include: - // - Arbitrary identifiers (e.g. `@_spi(RawSyntax)`) - // - An integer literal (e.g. `@_alignment(4)`) - // - // Because there seem to be very little restrictions on these parameters (they could be keywords instead of identifiers), we just allow any token. - return parseAttribute(argumentMode: .required) { parser in - if !parser.at(.rightParen) { - return .token(parser.consumeAnyToken()) - } else { - return .token(parser.missingToken(.identifier)) - } - } - case ._objcImplementation, ._nonSendable: - // Similar to the above but the argument is optional - return parseAttribute(argumentMode: .optional) { parser in - if !parser.at(.rightParen) { - return .token(parser.consumeAnyToken()) - } else { - return .token(parser.missingToken(.identifier)) - } - } case ._effects: return parseAttribute(argumentMode: .required) { parser in // The contents of the @_effects attribute are parsed in SIL, we just @@ -345,30 +270,14 @@ extension Parser { } return .effectsArguments(RawEffectsAttributeArgumentListSyntax(elements: tokens, arena: parser.arena)) } - case ._cdecl: - return parseAttribute(argumentMode: .required) { parser in - return .string(parser.parseStringLiteral()) - } case ._implements: return parseAttribute(argumentMode: .required) { parser in return .implementsArguments(parser.parseImplementsAttributeArguments()) } - case ._semantics: - return parseAttribute(argumentMode: .required) { parser in - return .string(parser.parseStringLiteral()) - } - case ._expose: - return parseAttribute(argumentMode: .required) { parser in - return .exposeAttributeArguments(parser.parseExposeArguments()) - } case ._originallyDefinedIn: return parseAttribute(argumentMode: .required) { parser in return .originallyDefinedInArguments(parser.parseOriginallyDefinedInAttributeArguments()) } - case ._unavailableFromAsync: - return parseAttribute(argumentMode: .optional) { parser in - return .unavailableFromAsyncArguments(parser.parseUnavailableFromAsyncAttributeArguments()) - } case .attached, .freestanding: return parseAttribute(argumentMode: .customAttribute) { parser in let arguments = parser.parseMacroRoleArguments() @@ -856,77 +765,6 @@ extension Parser { } } -extension Parser { - mutating func parseOpaqueReturnTypeOfAttributeArguments() -> RawOpaqueReturnTypeOfAttributeArgumentsSyntax { - let mangledName = self.parseStringLiteral() - let (unexpectedBeforeComma, comma) = self.expect(.comma) - let (unexpectedBeforeOrdinal, ordinal) = self.expect(.integerLiteral) - return RawOpaqueReturnTypeOfAttributeArgumentsSyntax( - mangledName: mangledName, - unexpectedBeforeComma, - comma: comma, - unexpectedBeforeOrdinal, - ordinal: ordinal, - arena: self.arena - ) - } -} - -extension Parser { - mutating func parseConventionArguments() -> RawAttributeSyntax.Arguments { - if let witnessMethod = self.consume(if: .keyword(.witness_method)) { - let (unexpectedBeforeColon, colon) = self.expect(.colon) - let name = self.parseAnyIdentifier() - return .conventionWitnessMethodArguments( - RawConventionWitnessMethodAttributeArgumentsSyntax( - witnessMethodLabel: witnessMethod, - unexpectedBeforeColon, - colon: colon, - protocolName: name, - arena: self.arena - ) - ) - } else { - let (unexpectedBeforeLabel, label) = self.expect(.identifier) - let unexpectedBeforeComma: RawUnexpectedNodesSyntax? - let comma: RawTokenSyntax? - let unexpectedBeforeCTypeLabel: RawUnexpectedNodesSyntax? - let cTypeLabel: RawTokenSyntax? - let unexpectedBeforeColon: RawUnexpectedNodesSyntax? - let colon: RawTokenSyntax? - let cTypeString: RawStringLiteralExprSyntax? - if self.at(.comma) { - (unexpectedBeforeComma, comma) = self.expect(.comma) - (unexpectedBeforeCTypeLabel, cTypeLabel) = self.expect(.keyword(.cType)) - (unexpectedBeforeColon, colon) = self.expect(.colon) - cTypeString = self.parseStringLiteral() - } else { - unexpectedBeforeComma = nil - comma = nil - unexpectedBeforeCTypeLabel = nil - cTypeLabel = nil - unexpectedBeforeColon = nil - colon = nil - cTypeString = nil - } - return .conventionArguments( - RawConventionAttributeArgumentsSyntax( - unexpectedBeforeLabel, - conventionLabel: label, - unexpectedBeforeComma, - comma: comma, - unexpectedBeforeCTypeLabel, - cTypeLabel: cTypeLabel, - unexpectedBeforeColon, - colon: colon, - cTypeString: cTypeString, - arena: self.arena - ) - ) - } - } -} - extension Parser { mutating func parseIsolatedAttributeArguments() -> RawLabeledExprListSyntax { let (unexpectedBeforeIsolationKind, isolationKind) = @@ -1018,35 +856,6 @@ extension Parser { } } -extension Parser { - mutating func parseExposeArguments() -> RawExposeAttributeArgumentsSyntax { - let language: RawTokenSyntax - if !self.at(.rightParen, .comma) { - language = self.consumeAnyToken() - } else { - language = missingToken(.identifier) - } - let unexpectedBeforeComma: RawUnexpectedNodesSyntax? - let comma: RawTokenSyntax? - let cxxName: RawStringLiteralExprSyntax? - if self.at(.comma) { - (unexpectedBeforeComma, comma) = self.expect(.comma) - cxxName = self.parseStringLiteral() - } else { - unexpectedBeforeComma = nil - comma = nil - cxxName = nil - } - return RawExposeAttributeArgumentsSyntax( - language: language, - unexpectedBeforeComma, - comma: comma, - cxxName: cxxName, - arena: self.arena - ) - } -} - extension Parser { mutating func parseOriginallyDefinedInAttributeArguments() -> RawOriginallyDefinedInAttributeArgumentsSyntax { let (unexpectedBeforeModuleLabel, moduleLabel) = self.expect(.keyword(.module)) @@ -1082,22 +891,6 @@ extension Parser { } } -extension Parser { - mutating func parseUnderscorePrivateAttributeArguments() -> RawUnderscorePrivateAttributeArgumentsSyntax { - let (unexpectedBeforeLabel, label) = self.expect(.keyword(.sourceFile)) - let (unexpectedBeforeColon, colon) = self.expect(.colon) - let filename = self.parseStringLiteral() - return RawUnderscorePrivateAttributeArgumentsSyntax( - unexpectedBeforeLabel, - sourceFileLabel: label, - unexpectedBeforeColon, - colon: colon, - filename: filename, - arena: self.arena - ) - } -} - extension Parser { mutating func parseDynamicReplacementAttributeArguments() -> RawDynamicReplacementAttributeArgumentsSyntax { let (unexpectedBeforeLabel, label) = self.expect(.keyword(.for)) @@ -1125,31 +918,6 @@ extension Parser { } } -extension Parser { - mutating func parseUnavailableFromAsyncAttributeArguments() -> RawUnavailableFromAsyncAttributeArgumentsSyntax { - let (unexpectedBeforeLabel, label) = self.expect(.keyword(.message)) - let (unexpectedBeforeColon, colon) = self.expect(.colon) - - let unexpectedBetweenColonAndMessage: RawUnexpectedNodesSyntax? - if let equalToken = self.consume(if: .equal) { - unexpectedBetweenColonAndMessage = RawUnexpectedNodesSyntax([equalToken], arena: self.arena) - } else { - unexpectedBetweenColonAndMessage = nil - } - - let message = self.parseStringLiteral() - return RawUnavailableFromAsyncAttributeArgumentsSyntax( - unexpectedBeforeLabel, - messageLabel: label, - unexpectedBeforeColon, - colon: colon, - unexpectedBetweenColonAndMessage, - message: message, - arena: self.arena - ) - } -} - extension Parser { mutating func parseDocumentationAttributeArguments() -> RawDocumentationAttributeArgumentListSyntax { var arguments: [RawDocumentationAttributeArgumentSyntax] = [] diff --git a/Sources/SwiftParser/TokenPrecedence.swift b/Sources/SwiftParser/TokenPrecedence.swift index a41eaa2cce4..39784f5d2aa 100644 --- a/Sources/SwiftParser/TokenPrecedence.swift +++ b/Sources/SwiftParser/TokenPrecedence.swift @@ -261,36 +261,20 @@ enum TokenPrecedence: Comparable { self = .exprKeyword case // `DeclarationAttributeWithSpecialSyntax` - ._alignment, - ._backDeploy, - ._cdecl, + ._backDeploy, ._documentation, ._dynamicReplacement, ._effects, - ._expose, ._implements, - ._nonSendable, - ._objcImplementation, - ._objcRuntimeName, - ._optimize, ._originallyDefinedIn, - ._private, - ._projectedValueProperty, - ._semantics, ._specialize, - ._spi, ._spi_available, - ._swift_native_objc_runtime_base, - ._typeEraser, - ._unavailableFromAsync, .abi, .attached, .available, .backDeployed, .derivative, - .exclusivity, .freestanding, - .inline, .objc, .transpose: self = .exprKeyword @@ -324,7 +308,6 @@ enum TokenPrecedence: Comparable { .block, .canImport, .compiler, - .cType, .deprecated, .exported, .file, @@ -350,7 +333,6 @@ enum TokenPrecedence: Comparable { .reverse, .right, .safe, - .sourceFile, .spi, .spiModule, .swift, @@ -360,7 +342,6 @@ enum TokenPrecedence: Comparable { .unowned, .visibility, .weak, - .witness_method, .wrt, .x, .unsafe: diff --git a/Sources/SwiftParser/Types.swift b/Sources/SwiftParser/Types.swift index 4a672a1c734..8e8c171cf8c 100644 --- a/Sources/SwiftParser/Types.swift +++ b/Sources/SwiftParser/Types.swift @@ -1134,19 +1134,11 @@ extension Parser { case .differentiable: return .attribute(self.parseDifferentiableAttribute()) - case .convention: - return parseAttribute(argumentMode: .required) { parser in - return parser.parseConventionArguments() - } - case ._opaqueReturnTypeOf: - return parseAttribute(argumentMode: .required) { parser in - return .opaqueReturnTypeOfAttributeArguments(parser.parseOpaqueReturnTypeOfAttributeArguments()) - } case .isolated: return parseAttribute(argumentMode: .required) { parser in return .argumentList(parser.parseIsolatedAttributeArguments()) } - case nil: // Custom attribute + case .convention, ._opaqueReturnTypeOf, nil: // Custom attribute return parseAttribute(argumentMode: .customAttribute) { parser in let arguments = parser.parseArgumentListElements( pattern: .none, diff --git a/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift b/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift index 8c16ad71ea6..20b7c7702fd 100644 --- a/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift +++ b/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift @@ -1943,61 +1943,6 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor { return .visitChildren } - public override func visit(_ node: UnavailableFromAsyncAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - if shouldSkip(node) { - return .skipChildren - } - - if let equalToken = node.unexpectedBetweenColonAndMessage?.onlyPresentToken(where: { $0.tokenKind == .equal }) { - addDiagnostic( - equalToken, - MissingNodesError(missingNodes: [Syntax(node.colon)]), - fixIts: [ - FixIt( - message: ReplaceTokensFixIt( - replaceTokens: [equalToken], - replacements: [node.colon] - ), - changes: [ - .makeMissing(equalToken, transferTrivia: false), - .makePresent( - node.colon, - leadingTrivia: equalToken.leadingTrivia, - trailingTrivia: equalToken.trailingTrivia - ), - ] - ) - ], - handledNodes: [equalToken.id, node.colon.id] - ) - } - - if let token = node.unexpectedBetweenMessageLabelAndColon?.onlyPresentToken(where: { $0.tokenKind.isIdentifier }), - token.isPresent, - node.messageLabel.isMissing - { - addDiagnostic( - node, - MissingNodesError(missingNodes: [Syntax(node.messageLabel)]), - fixIts: [ - FixIt( - message: ReplaceTokensFixIt( - replaceTokens: [token], - replacements: [node.messageLabel] - ), - changes: [ - FixIt.MultiNodeChange.makeMissing(token), - FixIt.MultiNodeChange.makePresent(node.messageLabel), - ] - ) - ], - handledNodes: [node.messageLabel.id, token.id] - ) - } - - return .visitChildren - } - public override func visit(_ node: UnresolvedTernaryExprSyntax) -> SyntaxVisitorContinueKind { if shouldSkip(node) { return .skipChildren diff --git a/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift b/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift index c0d1d7640b2..a5afdfbf444 100644 --- a/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift +++ b/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift @@ -112,10 +112,6 @@ extension SyntaxKind { return "'consume' expression" case .continueStmt: return "'continue' statement" - case .conventionAttributeArguments: - return "@convention(...) arguments" - case .conventionWitnessMethodAttributeArguments: - return "@convention(...) arguments for witness methods" case .copyExpr: return "'copy' expression" case .declModifier: @@ -172,8 +168,6 @@ extension SyntaxKind { return "parameter" case .enumDecl: return "enum" - case .exposeAttributeArguments: - return "@_expose arguments" case .expressionPattern: return "pattern" case .expressionStmt: @@ -304,8 +298,6 @@ extension SyntaxKind { return "Objective-C selector" case .objCSelectorPiece: return "Objective-C selector piece" - case .opaqueReturnTypeOfAttributeArguments: - return "opaque return type arguments" case .operatorDecl: return "operator declaration" case .optionalBindingCondition: @@ -404,10 +396,6 @@ extension SyntaxKind { return "type annotation" case .typeEffectSpecifiers: return "effect specifiers" - case .unavailableFromAsyncAttributeArguments: - return "@_unavailableFromAsync argument" - case .underscorePrivateAttributeArguments: - return "@_private argument" case .unresolvedAsExpr: return "'as'" case .unresolvedIsExpr: diff --git a/Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md b/Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md index 88ad12bc5ed..6d74ef33dcb 100644 --- a/Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md +++ b/Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md @@ -305,8 +305,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code. - - - -- -- - - - @@ -317,20 +315,16 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code. - - - -- - - - - -- - - - - - - -- -- ### Miscellaneous Syntax diff --git a/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift b/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift index c2e22637f00..4f0645c8267 100644 --- a/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift +++ b/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift @@ -762,42 +762,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? { return "label" case \ContinueStmtSyntax.unexpectedAfterLabel: return "unexpectedAfterLabel" - case \ConventionAttributeArgumentsSyntax.unexpectedBeforeConventionLabel: - return "unexpectedBeforeConventionLabel" - case \ConventionAttributeArgumentsSyntax.conventionLabel: - return "conventionLabel" - case \ConventionAttributeArgumentsSyntax.unexpectedBetweenConventionLabelAndComma: - return "unexpectedBetweenConventionLabelAndComma" - case \ConventionAttributeArgumentsSyntax.comma: - return "comma" - case \ConventionAttributeArgumentsSyntax.unexpectedBetweenCommaAndCTypeLabel: - return "unexpectedBetweenCommaAndCTypeLabel" - case \ConventionAttributeArgumentsSyntax.cTypeLabel: - return "cTypeLabel" - case \ConventionAttributeArgumentsSyntax.unexpectedBetweenCTypeLabelAndColon: - return "unexpectedBetweenCTypeLabelAndColon" - case \ConventionAttributeArgumentsSyntax.colon: - return "colon" - case \ConventionAttributeArgumentsSyntax.unexpectedBetweenColonAndCTypeString: - return "unexpectedBetweenColonAndCTypeString" - case \ConventionAttributeArgumentsSyntax.cTypeString: - return "cTypeString" - case \ConventionAttributeArgumentsSyntax.unexpectedAfterCTypeString: - return "unexpectedAfterCTypeString" - case \ConventionWitnessMethodAttributeArgumentsSyntax.unexpectedBeforeWitnessMethodLabel: - return "unexpectedBeforeWitnessMethodLabel" - case \ConventionWitnessMethodAttributeArgumentsSyntax.witnessMethodLabel: - return "witnessMethodLabel" - case \ConventionWitnessMethodAttributeArgumentsSyntax.unexpectedBetweenWitnessMethodLabelAndColon: - return "unexpectedBetweenWitnessMethodLabelAndColon" - case \ConventionWitnessMethodAttributeArgumentsSyntax.colon: - return "colon" - case \ConventionWitnessMethodAttributeArgumentsSyntax.unexpectedBetweenColonAndProtocolName: - return "unexpectedBetweenColonAndProtocolName" - case \ConventionWitnessMethodAttributeArgumentsSyntax.protocolName: - return "protocolName" - case \ConventionWitnessMethodAttributeArgumentsSyntax.unexpectedAfterProtocolName: - return "unexpectedAfterProtocolName" case \CopyExprSyntax.unexpectedBeforeCopyKeyword: return "unexpectedBeforeCopyKeyword" case \CopyExprSyntax.copyKeyword: @@ -1272,20 +1236,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? { return "memberBlock" case \EnumDeclSyntax.unexpectedAfterMemberBlock: return "unexpectedAfterMemberBlock" - case \ExposeAttributeArgumentsSyntax.unexpectedBeforeLanguage: - return "unexpectedBeforeLanguage" - case \ExposeAttributeArgumentsSyntax.language: - return "language" - case \ExposeAttributeArgumentsSyntax.unexpectedBetweenLanguageAndComma: - return "unexpectedBetweenLanguageAndComma" - case \ExposeAttributeArgumentsSyntax.comma: - return "comma" - case \ExposeAttributeArgumentsSyntax.unexpectedBetweenCommaAndCxxName: - return "unexpectedBetweenCommaAndCxxName" - case \ExposeAttributeArgumentsSyntax.cxxName: - return "cxxName" - case \ExposeAttributeArgumentsSyntax.unexpectedAfterCxxName: - return "unexpectedAfterCxxName" case \ExpressionPatternSyntax.unexpectedBeforeExpression: return "unexpectedBeforeExpression" case \ExpressionPatternSyntax.expression: @@ -2430,20 +2380,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? { return "colon" case \ObjCSelectorPieceSyntax.unexpectedAfterColon: return "unexpectedAfterColon" - case \OpaqueReturnTypeOfAttributeArgumentsSyntax.unexpectedBeforeMangledName: - return "unexpectedBeforeMangledName" - case \OpaqueReturnTypeOfAttributeArgumentsSyntax.mangledName: - return "mangledName" - case \OpaqueReturnTypeOfAttributeArgumentsSyntax.unexpectedBetweenMangledNameAndComma: - return "unexpectedBetweenMangledNameAndComma" - case \OpaqueReturnTypeOfAttributeArgumentsSyntax.comma: - return "comma" - case \OpaqueReturnTypeOfAttributeArgumentsSyntax.unexpectedBetweenCommaAndOrdinal: - return "unexpectedBetweenCommaAndOrdinal" - case \OpaqueReturnTypeOfAttributeArgumentsSyntax.ordinal: - return "ordinal" - case \OpaqueReturnTypeOfAttributeArgumentsSyntax.unexpectedAfterOrdinal: - return "unexpectedAfterOrdinal" case \OperatorDeclSyntax.unexpectedBeforeFixitySpecifier: return "unexpectedBeforeFixitySpecifier" case \OperatorDeclSyntax.fixitySpecifier: @@ -3444,34 +3380,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? { return "value" case \TypeInitializerClauseSyntax.unexpectedAfterValue: return "unexpectedAfterValue" - case \UnavailableFromAsyncAttributeArgumentsSyntax.unexpectedBeforeMessageLabel: - return "unexpectedBeforeMessageLabel" - case \UnavailableFromAsyncAttributeArgumentsSyntax.messageLabel: - return "messageLabel" - case \UnavailableFromAsyncAttributeArgumentsSyntax.unexpectedBetweenMessageLabelAndColon: - return "unexpectedBetweenMessageLabelAndColon" - case \UnavailableFromAsyncAttributeArgumentsSyntax.colon: - return "colon" - case \UnavailableFromAsyncAttributeArgumentsSyntax.unexpectedBetweenColonAndMessage: - return "unexpectedBetweenColonAndMessage" - case \UnavailableFromAsyncAttributeArgumentsSyntax.message: - return "message" - case \UnavailableFromAsyncAttributeArgumentsSyntax.unexpectedAfterMessage: - return "unexpectedAfterMessage" - case \UnderscorePrivateAttributeArgumentsSyntax.unexpectedBeforeSourceFileLabel: - return "unexpectedBeforeSourceFileLabel" - case \UnderscorePrivateAttributeArgumentsSyntax.sourceFileLabel: - return "sourceFileLabel" - case \UnderscorePrivateAttributeArgumentsSyntax.unexpectedBetweenSourceFileLabelAndColon: - return "unexpectedBetweenSourceFileLabelAndColon" - case \UnderscorePrivateAttributeArgumentsSyntax.colon: - return "colon" - case \UnderscorePrivateAttributeArgumentsSyntax.unexpectedBetweenColonAndFilename: - return "unexpectedBetweenColonAndFilename" - case \UnderscorePrivateAttributeArgumentsSyntax.filename: - return "filename" - case \UnderscorePrivateAttributeArgumentsSyntax.unexpectedAfterFilename: - return "unexpectedAfterFilename" case \UnresolvedAsExprSyntax.unexpectedBeforeAsKeyword: return "unexpectedBeforeAsKeyword" case \UnresolvedAsExprSyntax.asKeyword: diff --git a/Sources/SwiftSyntax/generated/Keyword.swift b/Sources/SwiftSyntax/generated/Keyword.swift index 45fdc87921d..2abff52c6f4 100644 --- a/Sources/SwiftSyntax/generated/Keyword.swift +++ b/Sources/SwiftSyntax/generated/Keyword.swift @@ -18,12 +18,10 @@ public enum Keyword: UInt8, Hashable, Sendable { case __owned case __setter_access case __shared - case _alignment case _backDeploy case _borrow case _borrowing case _BridgeObject - case _cdecl case _Class case _compilerInitialized case _const @@ -32,7 +30,6 @@ public enum Keyword: UInt8, Hashable, Sendable { case _documentation case _dynamicReplacement case _effects - case _expose case _forward case _implements case _linear @@ -44,27 +41,16 @@ public enum Keyword: UInt8, Hashable, Sendable { case _NativeClass case _NativeRefCountedObject case _noMetadata - case _nonSendable - case _objcImplementation - case _objcRuntimeName case _opaqueReturnTypeOf - case _optimize case _originallyDefinedIn case _PackageDescription - case _private - case _projectedValueProperty case _read case _RefCountedObject - case _semantics case _specialize - case _spi case _spi_available - case _swift_native_objc_runtime_base case _Trivial case _TrivialAtMost case _TrivialStride - case _typeEraser - case _unavailableFromAsync case _underlyingVersion case _UnknownLayout case _version @@ -103,7 +89,6 @@ public enum Keyword: UInt8, Hashable, Sendable { case `continue` case convenience case convention - case cType case `default` case `defer` case `deinit` @@ -120,7 +105,6 @@ public enum Keyword: UInt8, Hashable, Sendable { case `else` case `enum` case escaping - case exclusivity case exported case `extension` case `fallthrough` @@ -143,7 +127,6 @@ public enum Keyword: UInt8, Hashable, Sendable { case infix case `init` case initializes - case inline case `inout` case `internal` case introduced @@ -208,7 +191,6 @@ public enum Keyword: UInt8, Hashable, Sendable { case Sendable case set case some - case sourceFile case spi case spiModule case `static` @@ -238,7 +220,6 @@ public enum Keyword: UInt8, Hashable, Sendable { case `where` case `while` case willSet - case witness_method case wrt @_spi(ExperimentalLanguageFeatures) case x @@ -301,8 +282,6 @@ public enum Keyword: UInt8, Hashable, Sendable { } case 4: switch text { - case "_spi": - self = ._spi case "case": self = .case case "copy": @@ -374,8 +353,6 @@ public enum Keyword: UInt8, Hashable, Sendable { self = .catch case "class": self = .class - case "cType": - self = .cType case "defer": self = .defer case "false": @@ -409,8 +386,6 @@ public enum Keyword: UInt8, Hashable, Sendable { } case 6: switch text { - case "_cdecl": - self = ._cdecl case "_Class": self = ._Class case "_const": @@ -427,8 +402,6 @@ public enum Keyword: UInt8, Hashable, Sendable { self = .didSet case "import": self = .import - case "inline": - self = .inline case "linear": self = .linear case "modify": @@ -466,8 +439,6 @@ public enum Keyword: UInt8, Hashable, Sendable { self = .__owned case "_borrow": self = ._borrow - case "_expose": - self = ._expose case "_linear": self = ._linear case "_modify": @@ -515,8 +486,6 @@ public enum Keyword: UInt8, Hashable, Sendable { self = ._effects case "_forward": self = ._forward - case "_private": - self = ._private case "_Trivial": self = ._Trivial case "_version": @@ -568,8 +537,6 @@ public enum Keyword: UInt8, Hashable, Sendable { switch text { case "_mutating": self = ._mutating - case "_optimize": - self = ._optimize case "available": self = .available case "borrowing": @@ -601,14 +568,10 @@ public enum Keyword: UInt8, Hashable, Sendable { } case 10: switch text { - case "_alignment": - self = ._alignment case "_borrowing": self = ._borrowing case "_consuming": self = ._consuming - case "_semantics": - self = ._semantics case "assignment": self = .assignment case "convention": @@ -621,8 +584,6 @@ public enum Keyword: UInt8, Hashable, Sendable { self = .higherThan case "introduced": self = .introduced - case "sourceFile": - self = .sourceFile case "visibility": self = .visibility default: @@ -640,16 +601,12 @@ public enum Keyword: UInt8, Hashable, Sendable { self = ._noMetadata case "_specialize": self = ._specialize - case "_typeEraser": - self = ._typeEraser case "autoclosure": self = .autoclosure case "convenience": self = .convenience case "distributed": self = .distributed - case "exclusivity": - self = .exclusivity case "fallthrough": self = .fallthrough case "fileprivate": @@ -671,8 +628,6 @@ public enum Keyword: UInt8, Hashable, Sendable { switch text { case "_NativeClass": self = ._NativeClass - case "_nonSendable": - self = ._nonSendable case "availability": self = .availability case "backDeployed": @@ -713,8 +668,6 @@ public enum Keyword: UInt8, Hashable, Sendable { self = .differentiable case "preconcurrency": self = .preconcurrency - case "witness_method": - self = .witness_method default: return nil } @@ -729,8 +682,6 @@ public enum Keyword: UInt8, Hashable, Sendable { } case 16: switch text { - case "_objcRuntimeName": - self = ._objcRuntimeName case "addressWithOwner": self = .addressWithOwner default: @@ -754,8 +705,6 @@ public enum Keyword: UInt8, Hashable, Sendable { switch text { case "_dynamicReplacement": self = ._dynamicReplacement - case "_objcImplementation": - self = ._objcImplementation case "_opaqueReturnTypeOf": self = ._opaqueReturnTypeOf case "_PackageDescription": @@ -774,13 +723,6 @@ public enum Keyword: UInt8, Hashable, Sendable { default: return nil } - case 21: - switch text { - case "_unavailableFromAsync": - self = ._unavailableFromAsync - default: - return nil - } case 22: switch text { case "addressWithNativeOwner": @@ -792,8 +734,6 @@ public enum Keyword: UInt8, Hashable, Sendable { switch text { case "_NativeRefCountedObject": self = ._NativeRefCountedObject - case "_projectedValueProperty": - self = ._projectedValueProperty case "mutableAddressWithOwner": self = .mutableAddressWithOwner default: @@ -806,13 +746,6 @@ public enum Keyword: UInt8, Hashable, Sendable { default: return nil } - case 31: - switch text { - case "_swift_native_objc_runtime_base": - self = ._swift_native_objc_runtime_base - default: - return nil - } default: return nil } @@ -828,12 +761,10 @@ public enum Keyword: UInt8, Hashable, Sendable { "__owned", "__setter_access", "__shared", - "_alignment", "_backDeploy", "_borrow", "_borrowing", "_BridgeObject", - "_cdecl", "_Class", "_compilerInitialized", "_const", @@ -841,7 +772,6 @@ public enum Keyword: UInt8, Hashable, Sendable { "_documentation", "_dynamicReplacement", "_effects", - "_expose", "_forward", "_implements", "_linear", @@ -852,27 +782,16 @@ public enum Keyword: UInt8, Hashable, Sendable { "_NativeClass", "_NativeRefCountedObject", "_noMetadata", - "_nonSendable", - "_objcImplementation", - "_objcRuntimeName", "_opaqueReturnTypeOf", - "_optimize", "_originallyDefinedIn", "_PackageDescription", - "_private", - "_projectedValueProperty", "_read", "_RefCountedObject", - "_semantics", "_specialize", - "_spi", "_spi_available", - "_swift_native_objc_runtime_base", "_Trivial", "_TrivialAtMost", "_TrivialStride", - "_typeEraser", - "_unavailableFromAsync", "_underlyingVersion", "_UnknownLayout", "_version", @@ -910,7 +829,6 @@ public enum Keyword: UInt8, Hashable, Sendable { "continue", "convenience", "convention", - "cType", "default", "defer", "deinit", @@ -926,7 +844,6 @@ public enum Keyword: UInt8, Hashable, Sendable { "else", "enum", "escaping", - "exclusivity", "exported", "extension", "fallthrough", @@ -949,7 +866,6 @@ public enum Keyword: UInt8, Hashable, Sendable { "infix", "init", "initializes", - "inline", "inout", "internal", "introduced", @@ -1011,7 +927,6 @@ public enum Keyword: UInt8, Hashable, Sendable { "Sendable", "set", "some", - "sourceFile", "spi", "spiModule", "static", @@ -1041,7 +956,6 @@ public enum Keyword: UInt8, Hashable, Sendable { "where", "while", "willSet", - "witness_method", "wrt", "x", "yield", diff --git a/Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift b/Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift index 4dd1ceb44b2..d9eed528b19 100644 --- a/Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift +++ b/Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift @@ -205,9 +205,6 @@ public typealias TypeSpecifierSyntax = SimpleTypeSpecifierSyntax @available(*, deprecated, renamed: "TypeAliasDeclSyntax") public typealias TypealiasDeclSyntax = TypeAliasDeclSyntax -@available(*, deprecated, renamed: "UnavailableFromAsyncAttributeArgumentsSyntax") -public typealias UnavailableFromAsyncArgumentsSyntax = UnavailableFromAsyncAttributeArgumentsSyntax - @available(*, deprecated, renamed: "PatternExprSyntax") public typealias UnresolvedPatternExprSyntax = PatternExprSyntax @@ -541,11 +538,6 @@ extension SyntaxKind { return .typeAliasDecl } - @available(*, deprecated, renamed: "UnavailableFromAsyncAttributeArgumentsSyntax") - public static var unavailableFromAsyncArguments: Self { - return .unavailableFromAsyncAttributeArguments - } - @available(*, deprecated, renamed: "PatternExprSyntax") public static var unresolvedPatternExpr: Self { return .patternExpr diff --git a/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift index da2650dca59..a48aab9ea71 100644 --- a/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift +++ b/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift @@ -563,22 +563,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor { visitAnyPost(node._syntaxNode) } - override open func visit(_ node: ConventionAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return visitAny(node._syntaxNode) - } - - override open func visitPost(_ node: ConventionAttributeArgumentsSyntax) { - visitAnyPost(node._syntaxNode) - } - - override open func visit(_ node: ConventionWitnessMethodAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return visitAny(node._syntaxNode) - } - - override open func visitPost(_ node: ConventionWitnessMethodAttributeArgumentsSyntax) { - visitAnyPost(node._syntaxNode) - } - override open func visit(_ node: CopyExprSyntax) -> SyntaxVisitorContinueKind { return visitAny(node._syntaxNode) } @@ -901,14 +885,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor { visitAnyPost(node._syntaxNode) } - override open func visit(_ node: ExposeAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return visitAny(node._syntaxNode) - } - - override open func visitPost(_ node: ExposeAttributeArgumentsSyntax) { - visitAnyPost(node._syntaxNode) - } - override open func visit(_ node: ExprListSyntax) -> SyntaxVisitorContinueKind { return visitAny(node._syntaxNode) } @@ -1625,14 +1601,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor { visitAnyPost(node._syntaxNode) } - override open func visit(_ node: OpaqueReturnTypeOfAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return visitAny(node._syntaxNode) - } - - override open func visitPost(_ node: OpaqueReturnTypeOfAttributeArgumentsSyntax) { - visitAnyPost(node._syntaxNode) - } - override open func visit(_ node: OperatorDeclSyntax) -> SyntaxVisitorContinueKind { return visitAny(node._syntaxNode) } @@ -2267,22 +2235,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor { visitAnyPost(node._syntaxNode) } - override open func visit(_ node: UnavailableFromAsyncAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return visitAny(node._syntaxNode) - } - - override open func visitPost(_ node: UnavailableFromAsyncAttributeArgumentsSyntax) { - visitAnyPost(node._syntaxNode) - } - - override open func visit(_ node: UnderscorePrivateAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return visitAny(node._syntaxNode) - } - - override open func visitPost(_ node: UnderscorePrivateAttributeArgumentsSyntax) { - visitAnyPost(node._syntaxNode) - } - override open func visit(_ node: UnexpectedNodesSyntax) -> SyntaxVisitorContinueKind { return visitAny(node._syntaxNode) } diff --git a/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift b/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift index 6740aafebce..89d739db3ed 100644 --- a/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift +++ b/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift @@ -1573,8 +1573,6 @@ extension Syntax { .node(ConformanceRequirementSyntax.self), .node(ConsumeExprSyntax.self), .node(ContinueStmtSyntax.self), - .node(ConventionAttributeArgumentsSyntax.self), - .node(ConventionWitnessMethodAttributeArgumentsSyntax.self), .node(CopyExprSyntax.self), .node(DeclModifierDetailSyntax.self), .node(DeclModifierListSyntax.self), @@ -1615,7 +1613,6 @@ extension Syntax { .node(EnumCaseParameterListSyntax.self), .node(EnumCaseParameterSyntax.self), .node(EnumDeclSyntax.self), - .node(ExposeAttributeArgumentsSyntax.self), .node(ExprListSyntax.self), .node(ExpressionPatternSyntax.self), .node(ExpressionSegmentSyntax.self), @@ -1704,7 +1701,6 @@ extension Syntax { .node(NilLiteralExprSyntax.self), .node(ObjCSelectorPieceListSyntax.self), .node(ObjCSelectorPieceSyntax.self), - .node(OpaqueReturnTypeOfAttributeArgumentsSyntax.self), .node(OperatorDeclSyntax.self), .node(OperatorPrecedenceAndTypesSyntax.self), .node(OptionalBindingConditionSyntax.self), @@ -1784,8 +1780,6 @@ extension Syntax { .node(TypeExprSyntax.self), .node(TypeInitializerClauseSyntax.self), .node(TypeSpecifierListSyntax.self), - .node(UnavailableFromAsyncAttributeArgumentsSyntax.self), - .node(UnderscorePrivateAttributeArgumentsSyntax.self), .node(UnexpectedNodesSyntax.self), .node(UnresolvedAsExprSyntax.self), .node(UnresolvedIsExprSyntax.self), diff --git a/Sources/SwiftSyntax/generated/SyntaxEnum.swift b/Sources/SwiftSyntax/generated/SyntaxEnum.swift index 984dddcc7b4..dacab406c29 100644 --- a/Sources/SwiftSyntax/generated/SyntaxEnum.swift +++ b/Sources/SwiftSyntax/generated/SyntaxEnum.swift @@ -83,8 +83,6 @@ public enum SyntaxEnum: Sendable { case conformanceRequirement(ConformanceRequirementSyntax) case consumeExpr(ConsumeExprSyntax) case continueStmt(ContinueStmtSyntax) - case conventionAttributeArguments(ConventionAttributeArgumentsSyntax) - case conventionWitnessMethodAttributeArguments(ConventionWitnessMethodAttributeArgumentsSyntax) case copyExpr(CopyExprSyntax) case declModifierDetail(DeclModifierDetailSyntax) case declModifierList(DeclModifierListSyntax) @@ -126,7 +124,6 @@ public enum SyntaxEnum: Sendable { case enumCaseParameterList(EnumCaseParameterListSyntax) case enumCaseParameter(EnumCaseParameterSyntax) case enumDecl(EnumDeclSyntax) - case exposeAttributeArguments(ExposeAttributeArgumentsSyntax) case exprList(ExprListSyntax) case expressionPattern(ExpressionPatternSyntax) case expressionSegment(ExpressionSegmentSyntax) @@ -221,7 +218,6 @@ public enum SyntaxEnum: Sendable { case nilLiteralExpr(NilLiteralExprSyntax) case objCSelectorPieceList(ObjCSelectorPieceListSyntax) case objCSelectorPiece(ObjCSelectorPieceSyntax) - case opaqueReturnTypeOfAttributeArguments(OpaqueReturnTypeOfAttributeArgumentsSyntax) case operatorDecl(OperatorDeclSyntax) case operatorPrecedenceAndTypes(OperatorPrecedenceAndTypesSyntax) case optionalBindingCondition(OptionalBindingConditionSyntax) @@ -302,8 +298,6 @@ public enum SyntaxEnum: Sendable { case typeExpr(TypeExprSyntax) case typeInitializerClause(TypeInitializerClauseSyntax) case typeSpecifierList(TypeSpecifierListSyntax) - case unavailableFromAsyncAttributeArguments(UnavailableFromAsyncAttributeArgumentsSyntax) - case underscorePrivateAttributeArguments(UnderscorePrivateAttributeArgumentsSyntax) case unexpectedNodes(UnexpectedNodesSyntax) case unresolvedAsExpr(UnresolvedAsExprSyntax) case unresolvedIsExpr(UnresolvedIsExprSyntax) @@ -453,10 +447,6 @@ extension Syntax { return .consumeExpr(ConsumeExprSyntax(self)!) case .continueStmt: return .continueStmt(ContinueStmtSyntax(self)!) - case .conventionAttributeArguments: - return .conventionAttributeArguments(ConventionAttributeArgumentsSyntax(self)!) - case .conventionWitnessMethodAttributeArguments: - return .conventionWitnessMethodAttributeArguments(ConventionWitnessMethodAttributeArgumentsSyntax(self)!) case .copyExpr: return .copyExpr(CopyExprSyntax(self)!) case .declModifierDetail: @@ -537,8 +527,6 @@ extension Syntax { return .enumCaseParameter(EnumCaseParameterSyntax(self)!) case .enumDecl: return .enumDecl(EnumDeclSyntax(self)!) - case .exposeAttributeArguments: - return .exposeAttributeArguments(ExposeAttributeArgumentsSyntax(self)!) case .exprList: return .exprList(ExprListSyntax(self)!) case .expressionPattern: @@ -715,8 +703,6 @@ extension Syntax { return .objCSelectorPieceList(ObjCSelectorPieceListSyntax(self)!) case .objCSelectorPiece: return .objCSelectorPiece(ObjCSelectorPieceSyntax(self)!) - case .opaqueReturnTypeOfAttributeArguments: - return .opaqueReturnTypeOfAttributeArguments(OpaqueReturnTypeOfAttributeArgumentsSyntax(self)!) case .operatorDecl: return .operatorDecl(OperatorDeclSyntax(self)!) case .operatorPrecedenceAndTypes: @@ -875,10 +861,6 @@ extension Syntax { return .typeInitializerClause(TypeInitializerClauseSyntax(self)!) case .typeSpecifierList: return .typeSpecifierList(TypeSpecifierListSyntax(self)!) - case .unavailableFromAsyncAttributeArguments: - return .unavailableFromAsyncAttributeArguments(UnavailableFromAsyncAttributeArgumentsSyntax(self)!) - case .underscorePrivateAttributeArguments: - return .underscorePrivateAttributeArguments(UnderscorePrivateAttributeArgumentsSyntax(self)!) case .unexpectedNodes: return .unexpectedNodes(UnexpectedNodesSyntax(self)!) case .unresolvedAsExpr: diff --git a/Sources/SwiftSyntax/generated/SyntaxKind.swift b/Sources/SwiftSyntax/generated/SyntaxKind.swift index 1d086690f59..f1476b00ef4 100644 --- a/Sources/SwiftSyntax/generated/SyntaxKind.swift +++ b/Sources/SwiftSyntax/generated/SyntaxKind.swift @@ -83,8 +83,6 @@ public enum SyntaxKind: Sendable { case conformanceRequirement case consumeExpr case continueStmt - case conventionAttributeArguments - case conventionWitnessMethodAttributeArguments case copyExpr case declModifierDetail case declModifierList @@ -126,7 +124,6 @@ public enum SyntaxKind: Sendable { case enumCaseParameterList case enumCaseParameter case enumDecl - case exposeAttributeArguments case exprList case expressionPattern case expressionSegment @@ -221,7 +218,6 @@ public enum SyntaxKind: Sendable { case nilLiteralExpr case objCSelectorPieceList case objCSelectorPiece - case opaqueReturnTypeOfAttributeArguments case operatorDecl case operatorPrecedenceAndTypes case optionalBindingCondition @@ -302,8 +298,6 @@ public enum SyntaxKind: Sendable { case typeExpr case typeInitializerClause case typeSpecifierList - case unavailableFromAsyncAttributeArguments - case underscorePrivateAttributeArguments case unexpectedNodes case unresolvedAsExpr case unresolvedIsExpr @@ -578,10 +572,6 @@ public enum SyntaxKind: Sendable { return ConsumeExprSyntax.self case .continueStmt: return ContinueStmtSyntax.self - case .conventionAttributeArguments: - return ConventionAttributeArgumentsSyntax.self - case .conventionWitnessMethodAttributeArguments: - return ConventionWitnessMethodAttributeArgumentsSyntax.self case .copyExpr: return CopyExprSyntax.self case .declModifierDetail: @@ -662,8 +652,6 @@ public enum SyntaxKind: Sendable { return EnumCaseParameterSyntax.self case .enumDecl: return EnumDeclSyntax.self - case .exposeAttributeArguments: - return ExposeAttributeArgumentsSyntax.self case .exprList: return ExprListSyntax.self case .expressionPattern: @@ -840,8 +828,6 @@ public enum SyntaxKind: Sendable { return ObjCSelectorPieceListSyntax.self case .objCSelectorPiece: return ObjCSelectorPieceSyntax.self - case .opaqueReturnTypeOfAttributeArguments: - return OpaqueReturnTypeOfAttributeArgumentsSyntax.self case .operatorDecl: return OperatorDeclSyntax.self case .operatorPrecedenceAndTypes: @@ -1000,10 +986,6 @@ public enum SyntaxKind: Sendable { return TypeInitializerClauseSyntax.self case .typeSpecifierList: return TypeSpecifierListSyntax.self - case .unavailableFromAsyncAttributeArguments: - return UnavailableFromAsyncAttributeArgumentsSyntax.self - case .underscorePrivateAttributeArguments: - return UnderscorePrivateAttributeArgumentsSyntax.self case .unexpectedNodes: return UnexpectedNodesSyntax.self case .unresolvedAsExpr: diff --git a/Sources/SwiftSyntax/generated/SyntaxRewriter.swift b/Sources/SwiftSyntax/generated/SyntaxRewriter.swift index b5d5791640e..fe361ee516f 100644 --- a/Sources/SwiftSyntax/generated/SyntaxRewriter.swift +++ b/Sources/SwiftSyntax/generated/SyntaxRewriter.swift @@ -538,20 +538,6 @@ open class SyntaxRewriter { return StmtSyntax(ContinueStmtSyntax(unsafeCasting: visitChildren(node._syntaxNode))) } - /// Visit a ``ConventionAttributeArgumentsSyntax``. - /// - Parameter node: the node that is being visited - /// - Returns: the rewritten node - open func visit(_ node: ConventionAttributeArgumentsSyntax) -> ConventionAttributeArgumentsSyntax { - return ConventionAttributeArgumentsSyntax(unsafeCasting: visitChildren(node._syntaxNode)) - } - - /// Visit a ``ConventionWitnessMethodAttributeArgumentsSyntax``. - /// - Parameter node: the node that is being visited - /// - Returns: the rewritten node - open func visit(_ node: ConventionWitnessMethodAttributeArgumentsSyntax) -> ConventionWitnessMethodAttributeArgumentsSyntax { - return ConventionWitnessMethodAttributeArgumentsSyntax(unsafeCasting: visitChildren(node._syntaxNode)) - } - /// Visit a ``CopyExprSyntax``. /// - Parameter node: the node that is being visited /// - Returns: the rewritten node @@ -833,13 +819,6 @@ open class SyntaxRewriter { return DeclSyntax(EnumDeclSyntax(unsafeCasting: visitChildren(node._syntaxNode))) } - /// Visit a ``ExposeAttributeArgumentsSyntax``. - /// - Parameter node: the node that is being visited - /// - Returns: the rewritten node - open func visit(_ node: ExposeAttributeArgumentsSyntax) -> ExposeAttributeArgumentsSyntax { - return ExposeAttributeArgumentsSyntax(unsafeCasting: visitChildren(node._syntaxNode)) - } - /// Visit a ``ExprListSyntax``. /// - Parameter node: the node that is being visited /// - Returns: the rewritten node @@ -1462,13 +1441,6 @@ open class SyntaxRewriter { return ObjCSelectorPieceSyntax(unsafeCasting: visitChildren(node._syntaxNode)) } - /// Visit a ``OpaqueReturnTypeOfAttributeArgumentsSyntax``. - /// - Parameter node: the node that is being visited - /// - Returns: the rewritten node - open func visit(_ node: OpaqueReturnTypeOfAttributeArgumentsSyntax) -> OpaqueReturnTypeOfAttributeArgumentsSyntax { - return OpaqueReturnTypeOfAttributeArgumentsSyntax(unsafeCasting: visitChildren(node._syntaxNode)) - } - /// Visit a ``OperatorDeclSyntax``. /// - Parameter node: the node that is being visited /// - Returns: the rewritten node @@ -2023,20 +1995,6 @@ open class SyntaxRewriter { return TypeSpecifierListSyntax(unsafeCasting: visitChildren(node._syntaxNode)) } - /// Visit a ``UnavailableFromAsyncAttributeArgumentsSyntax``. - /// - Parameter node: the node that is being visited - /// - Returns: the rewritten node - open func visit(_ node: UnavailableFromAsyncAttributeArgumentsSyntax) -> UnavailableFromAsyncAttributeArgumentsSyntax { - return UnavailableFromAsyncAttributeArgumentsSyntax(unsafeCasting: visitChildren(node._syntaxNode)) - } - - /// Visit a ``UnderscorePrivateAttributeArgumentsSyntax``. - /// - Parameter node: the node that is being visited - /// - Returns: the rewritten node - open func visit(_ node: UnderscorePrivateAttributeArgumentsSyntax) -> UnderscorePrivateAttributeArgumentsSyntax { - return UnderscorePrivateAttributeArgumentsSyntax(unsafeCasting: visitChildren(node._syntaxNode)) - } - /// Visit a ``UnexpectedNodesSyntax``. /// - Parameter node: the node that is being visited /// - Returns: the rewritten node @@ -2506,16 +2464,6 @@ open class SyntaxRewriter { Syntax(visit(ContinueStmtSyntax(unsafeCasting: node))) } - @inline(never) - private func visitConventionAttributeArgumentsSyntaxImpl(_ node: Syntax) -> Syntax { - Syntax(visit(ConventionAttributeArgumentsSyntax(unsafeCasting: node))) - } - - @inline(never) - private func visitConventionWitnessMethodAttributeArgumentsSyntaxImpl(_ node: Syntax) -> Syntax { - Syntax(visit(ConventionWitnessMethodAttributeArgumentsSyntax(unsafeCasting: node))) - } - @inline(never) private func visitCopyExprSyntaxImpl(_ node: Syntax) -> Syntax { Syntax(visit(CopyExprSyntax(unsafeCasting: node))) @@ -2716,11 +2664,6 @@ open class SyntaxRewriter { Syntax(visit(EnumDeclSyntax(unsafeCasting: node))) } - @inline(never) - private func visitExposeAttributeArgumentsSyntaxImpl(_ node: Syntax) -> Syntax { - Syntax(visit(ExposeAttributeArgumentsSyntax(unsafeCasting: node))) - } - @inline(never) private func visitExprListSyntaxImpl(_ node: Syntax) -> Syntax { Syntax(visit(ExprListSyntax(unsafeCasting: node))) @@ -3161,11 +3104,6 @@ open class SyntaxRewriter { Syntax(visit(ObjCSelectorPieceSyntax(unsafeCasting: node))) } - @inline(never) - private func visitOpaqueReturnTypeOfAttributeArgumentsSyntaxImpl(_ node: Syntax) -> Syntax { - Syntax(visit(OpaqueReturnTypeOfAttributeArgumentsSyntax(unsafeCasting: node))) - } - @inline(never) private func visitOperatorDeclSyntaxImpl(_ node: Syntax) -> Syntax { Syntax(visit(OperatorDeclSyntax(unsafeCasting: node))) @@ -3561,16 +3499,6 @@ open class SyntaxRewriter { Syntax(visit(TypeSpecifierListSyntax(unsafeCasting: node))) } - @inline(never) - private func visitUnavailableFromAsyncAttributeArgumentsSyntaxImpl(_ node: Syntax) -> Syntax { - Syntax(visit(UnavailableFromAsyncAttributeArgumentsSyntax(unsafeCasting: node))) - } - - @inline(never) - private func visitUnderscorePrivateAttributeArgumentsSyntaxImpl(_ node: Syntax) -> Syntax { - Syntax(visit(UnderscorePrivateAttributeArgumentsSyntax(unsafeCasting: node))) - } - @inline(never) private func visitUnexpectedNodesSyntaxImpl(_ node: Syntax) -> Syntax { Syntax(visit(UnexpectedNodesSyntax(unsafeCasting: node))) @@ -3808,10 +3736,6 @@ open class SyntaxRewriter { return self.visitConsumeExprSyntaxImpl(_:) case .continueStmt: return self.visitContinueStmtSyntaxImpl(_:) - case .conventionAttributeArguments: - return self.visitConventionAttributeArgumentsSyntaxImpl(_:) - case .conventionWitnessMethodAttributeArguments: - return self.visitConventionWitnessMethodAttributeArgumentsSyntaxImpl(_:) case .copyExpr: return self.visitCopyExprSyntaxImpl(_:) case .declModifierDetail: @@ -3892,8 +3816,6 @@ open class SyntaxRewriter { return self.visitEnumCaseParameterSyntaxImpl(_:) case .enumDecl: return self.visitEnumDeclSyntaxImpl(_:) - case .exposeAttributeArguments: - return self.visitExposeAttributeArgumentsSyntaxImpl(_:) case .exprList: return self.visitExprListSyntaxImpl(_:) case .expressionPattern: @@ -4070,8 +3992,6 @@ open class SyntaxRewriter { return self.visitObjCSelectorPieceListSyntaxImpl(_:) case .objCSelectorPiece: return self.visitObjCSelectorPieceSyntaxImpl(_:) - case .opaqueReturnTypeOfAttributeArguments: - return self.visitOpaqueReturnTypeOfAttributeArgumentsSyntaxImpl(_:) case .operatorDecl: return self.visitOperatorDeclSyntaxImpl(_:) case .operatorPrecedenceAndTypes: @@ -4230,10 +4150,6 @@ open class SyntaxRewriter { return self.visitTypeInitializerClauseSyntaxImpl(_:) case .typeSpecifierList: return self.visitTypeSpecifierListSyntaxImpl(_:) - case .unavailableFromAsyncAttributeArguments: - return self.visitUnavailableFromAsyncAttributeArgumentsSyntaxImpl(_:) - case .underscorePrivateAttributeArguments: - return self.visitUnderscorePrivateAttributeArgumentsSyntaxImpl(_:) case .unexpectedNodes: return self.visitUnexpectedNodesSyntaxImpl(_:) case .unresolvedAsExpr: @@ -4402,10 +4318,6 @@ open class SyntaxRewriter { return visitConsumeExprSyntaxImpl(node) case .continueStmt: return visitContinueStmtSyntaxImpl(node) - case .conventionAttributeArguments: - return visitConventionAttributeArgumentsSyntaxImpl(node) - case .conventionWitnessMethodAttributeArguments: - return visitConventionWitnessMethodAttributeArgumentsSyntaxImpl(node) case .copyExpr: return visitCopyExprSyntaxImpl(node) case .declModifierDetail: @@ -4486,8 +4398,6 @@ open class SyntaxRewriter { return visitEnumCaseParameterSyntaxImpl(node) case .enumDecl: return visitEnumDeclSyntaxImpl(node) - case .exposeAttributeArguments: - return visitExposeAttributeArgumentsSyntaxImpl(node) case .exprList: return visitExprListSyntaxImpl(node) case .expressionPattern: @@ -4664,8 +4574,6 @@ open class SyntaxRewriter { return visitObjCSelectorPieceListSyntaxImpl(node) case .objCSelectorPiece: return visitObjCSelectorPieceSyntaxImpl(node) - case .opaqueReturnTypeOfAttributeArguments: - return visitOpaqueReturnTypeOfAttributeArgumentsSyntaxImpl(node) case .operatorDecl: return visitOperatorDeclSyntaxImpl(node) case .operatorPrecedenceAndTypes: @@ -4824,10 +4732,6 @@ open class SyntaxRewriter { return visitTypeInitializerClauseSyntaxImpl(node) case .typeSpecifierList: return visitTypeSpecifierListSyntaxImpl(node) - case .unavailableFromAsyncAttributeArguments: - return visitUnavailableFromAsyncAttributeArgumentsSyntaxImpl(node) - case .underscorePrivateAttributeArguments: - return visitUnderscorePrivateAttributeArgumentsSyntaxImpl(node) case .unexpectedNodes: return visitUnexpectedNodesSyntaxImpl(node) case .unresolvedAsExpr: diff --git a/Sources/SwiftSyntax/generated/SyntaxVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxVisitor.swift index c79186d1797..f6c0bbd35f2 100644 --- a/Sources/SwiftSyntax/generated/SyntaxVisitor.swift +++ b/Sources/SwiftSyntax/generated/SyntaxVisitor.swift @@ -789,30 +789,6 @@ open class SyntaxVisitor { open func visitPost(_ node: ContinueStmtSyntax) { } - /// Visiting ``ConventionAttributeArgumentsSyntax`` specifically. - /// - Parameter node: the node we are visiting. - /// - Returns: how should we continue visiting. - open func visit(_ node: ConventionAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return .visitChildren - } - - /// The function called after visiting ``ConventionAttributeArgumentsSyntax`` and its descendants. - /// - node: the node we just finished visiting. - open func visitPost(_ node: ConventionAttributeArgumentsSyntax) { - } - - /// Visiting ``ConventionWitnessMethodAttributeArgumentsSyntax`` specifically. - /// - Parameter node: the node we are visiting. - /// - Returns: how should we continue visiting. - open func visit(_ node: ConventionWitnessMethodAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return .visitChildren - } - - /// The function called after visiting ``ConventionWitnessMethodAttributeArgumentsSyntax`` and its descendants. - /// - node: the node we just finished visiting. - open func visitPost(_ node: ConventionWitnessMethodAttributeArgumentsSyntax) { - } - /// Visiting ``CopyExprSyntax`` specifically. /// - Parameter node: the node we are visiting. /// - Returns: how should we continue visiting. @@ -1295,18 +1271,6 @@ open class SyntaxVisitor { open func visitPost(_ node: EnumDeclSyntax) { } - /// Visiting ``ExposeAttributeArgumentsSyntax`` specifically. - /// - Parameter node: the node we are visiting. - /// - Returns: how should we continue visiting. - open func visit(_ node: ExposeAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return .visitChildren - } - - /// The function called after visiting ``ExposeAttributeArgumentsSyntax`` and its descendants. - /// - node: the node we just finished visiting. - open func visitPost(_ node: ExposeAttributeArgumentsSyntax) { - } - /// Visiting ``ExprListSyntax`` specifically. /// - Parameter node: the node we are visiting. /// - Returns: how should we continue visiting. @@ -2375,18 +2339,6 @@ open class SyntaxVisitor { open func visitPost(_ node: ObjCSelectorPieceSyntax) { } - /// Visiting ``OpaqueReturnTypeOfAttributeArgumentsSyntax`` specifically. - /// - Parameter node: the node we are visiting. - /// - Returns: how should we continue visiting. - open func visit(_ node: OpaqueReturnTypeOfAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return .visitChildren - } - - /// The function called after visiting ``OpaqueReturnTypeOfAttributeArgumentsSyntax`` and its descendants. - /// - node: the node we just finished visiting. - open func visitPost(_ node: OpaqueReturnTypeOfAttributeArgumentsSyntax) { - } - /// Visiting ``OperatorDeclSyntax`` specifically. /// - Parameter node: the node we are visiting. /// - Returns: how should we continue visiting. @@ -3337,30 +3289,6 @@ open class SyntaxVisitor { open func visitPost(_ node: TypeSpecifierListSyntax) { } - /// Visiting ``UnavailableFromAsyncAttributeArgumentsSyntax`` specifically. - /// - Parameter node: the node we are visiting. - /// - Returns: how should we continue visiting. - open func visit(_ node: UnavailableFromAsyncAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return .visitChildren - } - - /// The function called after visiting ``UnavailableFromAsyncAttributeArgumentsSyntax`` and its descendants. - /// - node: the node we just finished visiting. - open func visitPost(_ node: UnavailableFromAsyncAttributeArgumentsSyntax) { - } - - /// Visiting ``UnderscorePrivateAttributeArgumentsSyntax`` specifically. - /// - Parameter node: the node we are visiting. - /// - Returns: how should we continue visiting. - open func visit(_ node: UnderscorePrivateAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind { - return .visitChildren - } - - /// The function called after visiting ``UnderscorePrivateAttributeArgumentsSyntax`` and its descendants. - /// - node: the node we just finished visiting. - open func visitPost(_ node: UnderscorePrivateAttributeArgumentsSyntax) { - } - /// Visiting ``UnexpectedNodesSyntax`` specifically. /// - Parameter node: the node we are visiting. /// - Returns: how should we continue visiting. @@ -4080,22 +4008,6 @@ open class SyntaxVisitor { visitPost(ContinueStmtSyntax(unsafeCasting: node)) } - @inline(never) - private func visitConventionAttributeArgumentsSyntaxImpl(_ node: Syntax) { - if visit(ConventionAttributeArgumentsSyntax(unsafeCasting: node)) == .visitChildren { - visitChildren(node) - } - visitPost(ConventionAttributeArgumentsSyntax(unsafeCasting: node)) - } - - @inline(never) - private func visitConventionWitnessMethodAttributeArgumentsSyntaxImpl(_ node: Syntax) { - if visit(ConventionWitnessMethodAttributeArgumentsSyntax(unsafeCasting: node)) == .visitChildren { - visitChildren(node) - } - visitPost(ConventionWitnessMethodAttributeArgumentsSyntax(unsafeCasting: node)) - } - @inline(never) private func visitCopyExprSyntaxImpl(_ node: Syntax) { if visit(CopyExprSyntax(unsafeCasting: node)) == .visitChildren { @@ -4416,14 +4328,6 @@ open class SyntaxVisitor { visitPost(EnumDeclSyntax(unsafeCasting: node)) } - @inline(never) - private func visitExposeAttributeArgumentsSyntaxImpl(_ node: Syntax) { - if visit(ExposeAttributeArgumentsSyntax(unsafeCasting: node)) == .visitChildren { - visitChildren(node) - } - visitPost(ExposeAttributeArgumentsSyntax(unsafeCasting: node)) - } - @inline(never) private func visitExprListSyntaxImpl(_ node: Syntax) { if visit(ExprListSyntax(unsafeCasting: node)) == .visitChildren { @@ -5128,14 +5032,6 @@ open class SyntaxVisitor { visitPost(ObjCSelectorPieceSyntax(unsafeCasting: node)) } - @inline(never) - private func visitOpaqueReturnTypeOfAttributeArgumentsSyntaxImpl(_ node: Syntax) { - if visit(OpaqueReturnTypeOfAttributeArgumentsSyntax(unsafeCasting: node)) == .visitChildren { - visitChildren(node) - } - visitPost(OpaqueReturnTypeOfAttributeArgumentsSyntax(unsafeCasting: node)) - } - @inline(never) private func visitOperatorDeclSyntaxImpl(_ node: Syntax) { if visit(OperatorDeclSyntax(unsafeCasting: node)) == .visitChildren { @@ -5768,22 +5664,6 @@ open class SyntaxVisitor { visitPost(TypeSpecifierListSyntax(unsafeCasting: node)) } - @inline(never) - private func visitUnavailableFromAsyncAttributeArgumentsSyntaxImpl(_ node: Syntax) { - if visit(UnavailableFromAsyncAttributeArgumentsSyntax(unsafeCasting: node)) == .visitChildren { - visitChildren(node) - } - visitPost(UnavailableFromAsyncAttributeArgumentsSyntax(unsafeCasting: node)) - } - - @inline(never) - private func visitUnderscorePrivateAttributeArgumentsSyntaxImpl(_ node: Syntax) { - if visit(UnderscorePrivateAttributeArgumentsSyntax(unsafeCasting: node)) == .visitChildren { - visitChildren(node) - } - visitPost(UnderscorePrivateAttributeArgumentsSyntax(unsafeCasting: node)) - } - @inline(never) private func visitUnexpectedNodesSyntaxImpl(_ node: Syntax) { if visit(UnexpectedNodesSyntax(unsafeCasting: node)) == .visitChildren { @@ -6072,10 +5952,6 @@ open class SyntaxVisitor { return self.visitConsumeExprSyntaxImpl(_:) case .continueStmt: return self.visitContinueStmtSyntaxImpl(_:) - case .conventionAttributeArguments: - return self.visitConventionAttributeArgumentsSyntaxImpl(_:) - case .conventionWitnessMethodAttributeArguments: - return self.visitConventionWitnessMethodAttributeArgumentsSyntaxImpl(_:) case .copyExpr: return self.visitCopyExprSyntaxImpl(_:) case .declModifierDetail: @@ -6156,8 +6032,6 @@ open class SyntaxVisitor { return self.visitEnumCaseParameterSyntaxImpl(_:) case .enumDecl: return self.visitEnumDeclSyntaxImpl(_:) - case .exposeAttributeArguments: - return self.visitExposeAttributeArgumentsSyntaxImpl(_:) case .exprList: return self.visitExprListSyntaxImpl(_:) case .expressionPattern: @@ -6334,8 +6208,6 @@ open class SyntaxVisitor { return self.visitObjCSelectorPieceListSyntaxImpl(_:) case .objCSelectorPiece: return self.visitObjCSelectorPieceSyntaxImpl(_:) - case .opaqueReturnTypeOfAttributeArguments: - return self.visitOpaqueReturnTypeOfAttributeArgumentsSyntaxImpl(_:) case .operatorDecl: return self.visitOperatorDeclSyntaxImpl(_:) case .operatorPrecedenceAndTypes: @@ -6494,10 +6366,6 @@ open class SyntaxVisitor { return self.visitTypeInitializerClauseSyntaxImpl(_:) case .typeSpecifierList: return self.visitTypeSpecifierListSyntaxImpl(_:) - case .unavailableFromAsyncAttributeArguments: - return self.visitUnavailableFromAsyncAttributeArgumentsSyntaxImpl(_:) - case .underscorePrivateAttributeArguments: - return self.visitUnderscorePrivateAttributeArgumentsSyntaxImpl(_:) case .unexpectedNodes: return self.visitUnexpectedNodesSyntaxImpl(_:) case .unresolvedAsExpr: @@ -6666,10 +6534,6 @@ open class SyntaxVisitor { self.visitConsumeExprSyntaxImpl(node) case .continueStmt: self.visitContinueStmtSyntaxImpl(node) - case .conventionAttributeArguments: - self.visitConventionAttributeArgumentsSyntaxImpl(node) - case .conventionWitnessMethodAttributeArguments: - self.visitConventionWitnessMethodAttributeArgumentsSyntaxImpl(node) case .copyExpr: self.visitCopyExprSyntaxImpl(node) case .declModifierDetail: @@ -6750,8 +6614,6 @@ open class SyntaxVisitor { self.visitEnumCaseParameterSyntaxImpl(node) case .enumDecl: self.visitEnumDeclSyntaxImpl(node) - case .exposeAttributeArguments: - self.visitExposeAttributeArgumentsSyntaxImpl(node) case .exprList: self.visitExprListSyntaxImpl(node) case .expressionPattern: @@ -6928,8 +6790,6 @@ open class SyntaxVisitor { self.visitObjCSelectorPieceListSyntaxImpl(node) case .objCSelectorPiece: self.visitObjCSelectorPieceSyntaxImpl(node) - case .opaqueReturnTypeOfAttributeArguments: - self.visitOpaqueReturnTypeOfAttributeArgumentsSyntaxImpl(node) case .operatorDecl: self.visitOperatorDeclSyntaxImpl(node) case .operatorPrecedenceAndTypes: @@ -7088,10 +6948,6 @@ open class SyntaxVisitor { self.visitTypeInitializerClauseSyntaxImpl(node) case .typeSpecifierList: self.visitTypeSpecifierListSyntaxImpl(node) - case .unavailableFromAsyncAttributeArguments: - self.visitUnavailableFromAsyncAttributeArgumentsSyntaxImpl(node) - case .underscorePrivateAttributeArguments: - self.visitUnderscorePrivateAttributeArgumentsSyntaxImpl(node) case .unexpectedNodes: self.visitUnexpectedNodesSyntaxImpl(node) case .unresolvedAsExpr: diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesAB.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesAB.swift index 530a95fad51..5c824e33f3c 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesAB.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesAB.swift @@ -1604,8 +1604,6 @@ public struct RawAttributeListSyntax: RawSyntaxNodeProtocol { public struct RawAttributeSyntax: RawSyntaxNodeProtocol { public enum Arguments: RawSyntaxNodeProtocol { case argumentList(RawLabeledExprListSyntax) - case token(RawTokenSyntax) - case string(RawStringLiteralExprSyntax) case availability(RawAvailabilityArgumentListSyntax) case specializeArguments(RawSpecializeAttributeArgumentListSyntax) case objCName(RawObjCSelectorPieceListSyntax) @@ -1613,14 +1611,8 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol { case differentiableArguments(RawDifferentiableAttributeArgumentsSyntax) case derivativeRegistrationArguments(RawDerivativeAttributeArgumentsSyntax) case backDeployedArguments(RawBackDeployedAttributeArgumentsSyntax) - case conventionArguments(RawConventionAttributeArgumentsSyntax) - case conventionWitnessMethodArguments(RawConventionWitnessMethodAttributeArgumentsSyntax) - case opaqueReturnTypeOfAttributeArguments(RawOpaqueReturnTypeOfAttributeArgumentsSyntax) - case exposeAttributeArguments(RawExposeAttributeArgumentsSyntax) case originallyDefinedInArguments(RawOriginallyDefinedInAttributeArgumentsSyntax) - case underscorePrivateAttributeArguments(RawUnderscorePrivateAttributeArgumentsSyntax) case dynamicReplacementArguments(RawDynamicReplacementAttributeArgumentsSyntax) - case unavailableFromAsyncArguments(RawUnavailableFromAsyncAttributeArgumentsSyntax) case effectsArguments(RawEffectsAttributeArgumentListSyntax) case documentationArguments(RawDocumentationAttributeArgumentListSyntax) /// - Note: Requires experimental feature `abiAttribute`. @@ -1628,17 +1620,13 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol { case abiArguments(RawABIAttributeArgumentsSyntax) public static func isKindOf(_ raw: RawSyntax) -> Bool { - RawLabeledExprListSyntax.isKindOf(raw) || RawTokenSyntax.isKindOf(raw) || RawStringLiteralExprSyntax.isKindOf(raw) || RawAvailabilityArgumentListSyntax.isKindOf(raw) || RawSpecializeAttributeArgumentListSyntax.isKindOf(raw) || RawObjCSelectorPieceListSyntax.isKindOf(raw) || RawImplementsAttributeArgumentsSyntax.isKindOf(raw) || RawDifferentiableAttributeArgumentsSyntax.isKindOf(raw) || RawDerivativeAttributeArgumentsSyntax.isKindOf(raw) || RawBackDeployedAttributeArgumentsSyntax.isKindOf(raw) || RawConventionAttributeArgumentsSyntax.isKindOf(raw) || RawConventionWitnessMethodAttributeArgumentsSyntax.isKindOf(raw) || RawOpaqueReturnTypeOfAttributeArgumentsSyntax.isKindOf(raw) || RawExposeAttributeArgumentsSyntax.isKindOf(raw) || RawOriginallyDefinedInAttributeArgumentsSyntax.isKindOf(raw) || RawUnderscorePrivateAttributeArgumentsSyntax.isKindOf(raw) || RawDynamicReplacementAttributeArgumentsSyntax.isKindOf(raw) || RawUnavailableFromAsyncAttributeArgumentsSyntax.isKindOf(raw) || RawEffectsAttributeArgumentListSyntax.isKindOf(raw) || RawDocumentationAttributeArgumentListSyntax.isKindOf(raw) || RawABIAttributeArgumentsSyntax.isKindOf(raw) + RawLabeledExprListSyntax.isKindOf(raw) || RawAvailabilityArgumentListSyntax.isKindOf(raw) || RawSpecializeAttributeArgumentListSyntax.isKindOf(raw) || RawObjCSelectorPieceListSyntax.isKindOf(raw) || RawImplementsAttributeArgumentsSyntax.isKindOf(raw) || RawDifferentiableAttributeArgumentsSyntax.isKindOf(raw) || RawDerivativeAttributeArgumentsSyntax.isKindOf(raw) || RawBackDeployedAttributeArgumentsSyntax.isKindOf(raw) || RawOriginallyDefinedInAttributeArgumentsSyntax.isKindOf(raw) || RawDynamicReplacementAttributeArgumentsSyntax.isKindOf(raw) || RawEffectsAttributeArgumentListSyntax.isKindOf(raw) || RawDocumentationAttributeArgumentListSyntax.isKindOf(raw) || RawABIAttributeArgumentsSyntax.isKindOf(raw) } public var raw: RawSyntax { switch self { case .argumentList(let node): return node.raw - case .token(let node): - return node.raw - case .string(let node): - return node.raw case .availability(let node): return node.raw case .specializeArguments(let node): @@ -1653,22 +1641,10 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol { return node.raw case .backDeployedArguments(let node): return node.raw - case .conventionArguments(let node): - return node.raw - case .conventionWitnessMethodArguments(let node): - return node.raw - case .opaqueReturnTypeOfAttributeArguments(let node): - return node.raw - case .exposeAttributeArguments(let node): - return node.raw case .originallyDefinedInArguments(let node): return node.raw - case .underscorePrivateAttributeArguments(let node): - return node.raw case .dynamicReplacementArguments(let node): return node.raw - case .unavailableFromAsyncArguments(let node): - return node.raw case .effectsArguments(let node): return node.raw case .documentationArguments(let node): @@ -1681,10 +1657,6 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol { public init?(_ node: __shared some RawSyntaxNodeProtocol) { if let node = node.as(RawLabeledExprListSyntax.self) { self = .argumentList(node) - } else if let node = node.as(RawTokenSyntax.self) { - self = .token(node) - } else if let node = node.as(RawStringLiteralExprSyntax.self) { - self = .string(node) } else if let node = node.as(RawAvailabilityArgumentListSyntax.self) { self = .availability(node) } else if let node = node.as(RawSpecializeAttributeArgumentListSyntax.self) { @@ -1699,22 +1671,10 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol { self = .derivativeRegistrationArguments(node) } else if let node = node.as(RawBackDeployedAttributeArgumentsSyntax.self) { self = .backDeployedArguments(node) - } else if let node = node.as(RawConventionAttributeArgumentsSyntax.self) { - self = .conventionArguments(node) - } else if let node = node.as(RawConventionWitnessMethodAttributeArgumentsSyntax.self) { - self = .conventionWitnessMethodArguments(node) - } else if let node = node.as(RawOpaqueReturnTypeOfAttributeArgumentsSyntax.self) { - self = .opaqueReturnTypeOfAttributeArguments(node) - } else if let node = node.as(RawExposeAttributeArgumentsSyntax.self) { - self = .exposeAttributeArguments(node) } else if let node = node.as(RawOriginallyDefinedInAttributeArgumentsSyntax.self) { self = .originallyDefinedInArguments(node) - } else if let node = node.as(RawUnderscorePrivateAttributeArgumentsSyntax.self) { - self = .underscorePrivateAttributeArguments(node) } else if let node = node.as(RawDynamicReplacementAttributeArgumentsSyntax.self) { self = .dynamicReplacementArguments(node) - } else if let node = node.as(RawUnavailableFromAsyncAttributeArgumentsSyntax.self) { - self = .unavailableFromAsyncArguments(node) } else if let node = node.as(RawEffectsAttributeArgumentListSyntax.self) { self = .effectsArguments(node) } else if let node = node.as(RawDocumentationAttributeArgumentListSyntax.self) { diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesC.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesC.swift index 0ba00f62983..030c263c433 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesC.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesC.swift @@ -2511,194 +2511,6 @@ public struct RawContinueStmtSyntax: RawStmtSyntaxNodeProtocol { } } -@_spi(RawSyntax) -public struct RawConventionAttributeArgumentsSyntax: RawSyntaxNodeProtocol { - @_spi(RawSyntax) - public var layoutView: RawSyntaxLayoutView { - return raw.layoutView! - } - - public static func isKindOf(_ raw: RawSyntax) -> Bool { - return raw.kind == .conventionAttributeArguments - } - - public var raw: RawSyntax - - init(raw: RawSyntax) { - precondition(Self.isKindOf(raw)) - self.raw = raw - } - - private init(unchecked raw: RawSyntax) { - self.raw = raw - } - - public init?(_ other: some RawSyntaxNodeProtocol) { - guard Self.isKindOf(other.raw) else { - return nil - } - self.init(unchecked: other.raw) - } - - public init( - _ unexpectedBeforeConventionLabel: RawUnexpectedNodesSyntax? = nil, - conventionLabel: RawTokenSyntax, - _ unexpectedBetweenConventionLabelAndComma: RawUnexpectedNodesSyntax? = nil, - comma: RawTokenSyntax?, - _ unexpectedBetweenCommaAndCTypeLabel: RawUnexpectedNodesSyntax? = nil, - cTypeLabel: RawTokenSyntax?, - _ unexpectedBetweenCTypeLabelAndColon: RawUnexpectedNodesSyntax? = nil, - colon: RawTokenSyntax?, - _ unexpectedBetweenColonAndCTypeString: RawUnexpectedNodesSyntax? = nil, - cTypeString: RawStringLiteralExprSyntax?, - _ unexpectedAfterCTypeString: RawUnexpectedNodesSyntax? = nil, - arena: __shared RawSyntaxArena - ) { - let raw = RawSyntax.makeLayout( - kind: .conventionAttributeArguments, uninitializedCount: 11, arena: arena) { layout in - layout.initialize(repeating: nil) - layout[0] = unexpectedBeforeConventionLabel?.raw - layout[1] = conventionLabel.raw - layout[2] = unexpectedBetweenConventionLabelAndComma?.raw - layout[3] = comma?.raw - layout[4] = unexpectedBetweenCommaAndCTypeLabel?.raw - layout[5] = cTypeLabel?.raw - layout[6] = unexpectedBetweenCTypeLabelAndColon?.raw - layout[7] = colon?.raw - layout[8] = unexpectedBetweenColonAndCTypeString?.raw - layout[9] = cTypeString?.raw - layout[10] = unexpectedAfterCTypeString?.raw - } - self.init(unchecked: raw) - } - - public var unexpectedBeforeConventionLabel: RawUnexpectedNodesSyntax? { - layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var conventionLabel: RawTokenSyntax { - layoutView.children[1].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedBetweenConventionLabelAndComma: RawUnexpectedNodesSyntax? { - layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var comma: RawTokenSyntax? { - layoutView.children[3].map(RawTokenSyntax.init(raw:)) - } - - public var unexpectedBetweenCommaAndCTypeLabel: RawUnexpectedNodesSyntax? { - layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var cTypeLabel: RawTokenSyntax? { - layoutView.children[5].map(RawTokenSyntax.init(raw:)) - } - - public var unexpectedBetweenCTypeLabelAndColon: RawUnexpectedNodesSyntax? { - layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var colon: RawTokenSyntax? { - layoutView.children[7].map(RawTokenSyntax.init(raw:)) - } - - public var unexpectedBetweenColonAndCTypeString: RawUnexpectedNodesSyntax? { - layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var cTypeString: RawStringLiteralExprSyntax? { - layoutView.children[9].map(RawStringLiteralExprSyntax.init(raw:)) - } - - public var unexpectedAfterCTypeString: RawUnexpectedNodesSyntax? { - layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:)) - } -} - -@_spi(RawSyntax) -public struct RawConventionWitnessMethodAttributeArgumentsSyntax: RawSyntaxNodeProtocol { - @_spi(RawSyntax) - public var layoutView: RawSyntaxLayoutView { - return raw.layoutView! - } - - public static func isKindOf(_ raw: RawSyntax) -> Bool { - return raw.kind == .conventionWitnessMethodAttributeArguments - } - - public var raw: RawSyntax - - init(raw: RawSyntax) { - precondition(Self.isKindOf(raw)) - self.raw = raw - } - - private init(unchecked raw: RawSyntax) { - self.raw = raw - } - - public init?(_ other: some RawSyntaxNodeProtocol) { - guard Self.isKindOf(other.raw) else { - return nil - } - self.init(unchecked: other.raw) - } - - public init( - _ unexpectedBeforeWitnessMethodLabel: RawUnexpectedNodesSyntax? = nil, - witnessMethodLabel: RawTokenSyntax, - _ unexpectedBetweenWitnessMethodLabelAndColon: RawUnexpectedNodesSyntax? = nil, - colon: RawTokenSyntax, - _ unexpectedBetweenColonAndProtocolName: RawUnexpectedNodesSyntax? = nil, - protocolName: RawTokenSyntax, - _ unexpectedAfterProtocolName: RawUnexpectedNodesSyntax? = nil, - arena: __shared RawSyntaxArena - ) { - let raw = RawSyntax.makeLayout( - kind: .conventionWitnessMethodAttributeArguments, uninitializedCount: 7, arena: arena) { layout in - layout.initialize(repeating: nil) - layout[0] = unexpectedBeforeWitnessMethodLabel?.raw - layout[1] = witnessMethodLabel.raw - layout[2] = unexpectedBetweenWitnessMethodLabelAndColon?.raw - layout[3] = colon.raw - layout[4] = unexpectedBetweenColonAndProtocolName?.raw - layout[5] = protocolName.raw - layout[6] = unexpectedAfterProtocolName?.raw - } - self.init(unchecked: raw) - } - - public var unexpectedBeforeWitnessMethodLabel: RawUnexpectedNodesSyntax? { - layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var witnessMethodLabel: RawTokenSyntax { - layoutView.children[1].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedBetweenWitnessMethodLabelAndColon: RawUnexpectedNodesSyntax? { - layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var colon: RawTokenSyntax { - layoutView.children[3].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedBetweenColonAndProtocolName: RawUnexpectedNodesSyntax? { - layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var protocolName: RawTokenSyntax { - layoutView.children[5].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedAfterProtocolName: RawUnexpectedNodesSyntax? { - layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:)) - } -} - @_spi(RawSyntax) public struct RawCopyExprSyntax: RawExprSyntaxNodeProtocol { @_spi(RawSyntax) diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesEF.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesEF.swift index 5d4947c2166..7f88c6b06b1 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesEF.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesEF.swift @@ -848,88 +848,6 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol { } } -@_spi(RawSyntax) -public struct RawExposeAttributeArgumentsSyntax: RawSyntaxNodeProtocol { - @_spi(RawSyntax) - public var layoutView: RawSyntaxLayoutView { - return raw.layoutView! - } - - public static func isKindOf(_ raw: RawSyntax) -> Bool { - return raw.kind == .exposeAttributeArguments - } - - public var raw: RawSyntax - - init(raw: RawSyntax) { - precondition(Self.isKindOf(raw)) - self.raw = raw - } - - private init(unchecked raw: RawSyntax) { - self.raw = raw - } - - public init?(_ other: some RawSyntaxNodeProtocol) { - guard Self.isKindOf(other.raw) else { - return nil - } - self.init(unchecked: other.raw) - } - - public init( - _ unexpectedBeforeLanguage: RawUnexpectedNodesSyntax? = nil, - language: RawTokenSyntax, - _ unexpectedBetweenLanguageAndComma: RawUnexpectedNodesSyntax? = nil, - comma: RawTokenSyntax?, - _ unexpectedBetweenCommaAndCxxName: RawUnexpectedNodesSyntax? = nil, - cxxName: RawStringLiteralExprSyntax?, - _ unexpectedAfterCxxName: RawUnexpectedNodesSyntax? = nil, - arena: __shared RawSyntaxArena - ) { - let raw = RawSyntax.makeLayout( - kind: .exposeAttributeArguments, uninitializedCount: 7, arena: arena) { layout in - layout.initialize(repeating: nil) - layout[0] = unexpectedBeforeLanguage?.raw - layout[1] = language.raw - layout[2] = unexpectedBetweenLanguageAndComma?.raw - layout[3] = comma?.raw - layout[4] = unexpectedBetweenCommaAndCxxName?.raw - layout[5] = cxxName?.raw - layout[6] = unexpectedAfterCxxName?.raw - } - self.init(unchecked: raw) - } - - public var unexpectedBeforeLanguage: RawUnexpectedNodesSyntax? { - layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var language: RawTokenSyntax { - layoutView.children[1].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedBetweenLanguageAndComma: RawUnexpectedNodesSyntax? { - layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var comma: RawTokenSyntax? { - layoutView.children[3].map(RawTokenSyntax.init(raw:)) - } - - public var unexpectedBetweenCommaAndCxxName: RawUnexpectedNodesSyntax? { - layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var cxxName: RawStringLiteralExprSyntax? { - layoutView.children[5].map(RawStringLiteralExprSyntax.init(raw:)) - } - - public var unexpectedAfterCxxName: RawUnexpectedNodesSyntax? { - layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:)) - } -} - @_spi(RawSyntax) public struct RawExprListSyntax: RawSyntaxNodeProtocol { @_spi(RawSyntax) diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesOP.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesOP.swift index 519ec0aa7de..8414accabb0 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesOP.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesOP.swift @@ -136,88 +136,6 @@ public struct RawObjCSelectorPieceSyntax: RawSyntaxNodeProtocol { } } -@_spi(RawSyntax) -public struct RawOpaqueReturnTypeOfAttributeArgumentsSyntax: RawSyntaxNodeProtocol { - @_spi(RawSyntax) - public var layoutView: RawSyntaxLayoutView { - return raw.layoutView! - } - - public static func isKindOf(_ raw: RawSyntax) -> Bool { - return raw.kind == .opaqueReturnTypeOfAttributeArguments - } - - public var raw: RawSyntax - - init(raw: RawSyntax) { - precondition(Self.isKindOf(raw)) - self.raw = raw - } - - private init(unchecked raw: RawSyntax) { - self.raw = raw - } - - public init?(_ other: some RawSyntaxNodeProtocol) { - guard Self.isKindOf(other.raw) else { - return nil - } - self.init(unchecked: other.raw) - } - - public init( - _ unexpectedBeforeMangledName: RawUnexpectedNodesSyntax? = nil, - mangledName: RawStringLiteralExprSyntax, - _ unexpectedBetweenMangledNameAndComma: RawUnexpectedNodesSyntax? = nil, - comma: RawTokenSyntax, - _ unexpectedBetweenCommaAndOrdinal: RawUnexpectedNodesSyntax? = nil, - ordinal: RawTokenSyntax, - _ unexpectedAfterOrdinal: RawUnexpectedNodesSyntax? = nil, - arena: __shared RawSyntaxArena - ) { - let raw = RawSyntax.makeLayout( - kind: .opaqueReturnTypeOfAttributeArguments, uninitializedCount: 7, arena: arena) { layout in - layout.initialize(repeating: nil) - layout[0] = unexpectedBeforeMangledName?.raw - layout[1] = mangledName.raw - layout[2] = unexpectedBetweenMangledNameAndComma?.raw - layout[3] = comma.raw - layout[4] = unexpectedBetweenCommaAndOrdinal?.raw - layout[5] = ordinal.raw - layout[6] = unexpectedAfterOrdinal?.raw - } - self.init(unchecked: raw) - } - - public var unexpectedBeforeMangledName: RawUnexpectedNodesSyntax? { - layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var mangledName: RawStringLiteralExprSyntax { - layoutView.children[1].map(RawStringLiteralExprSyntax.init(raw:))! - } - - public var unexpectedBetweenMangledNameAndComma: RawUnexpectedNodesSyntax? { - layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var comma: RawTokenSyntax { - layoutView.children[3].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedBetweenCommaAndOrdinal: RawUnexpectedNodesSyntax? { - layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var ordinal: RawTokenSyntax { - layoutView.children[5].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedAfterOrdinal: RawUnexpectedNodesSyntax? { - layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:)) - } -} - @_spi(RawSyntax) public struct RawOperatorDeclSyntax: RawDeclSyntaxNodeProtocol { @_spi(RawSyntax) diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesTUVWXYZ.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesTUVWXYZ.swift index f8bba4db167..9dafdb8a7bf 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesTUVWXYZ.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesTUVWXYZ.swift @@ -1528,170 +1528,6 @@ public struct RawTypeSyntax: RawTypeSyntaxNodeProtocol { } } -@_spi(RawSyntax) -public struct RawUnavailableFromAsyncAttributeArgumentsSyntax: RawSyntaxNodeProtocol { - @_spi(RawSyntax) - public var layoutView: RawSyntaxLayoutView { - return raw.layoutView! - } - - public static func isKindOf(_ raw: RawSyntax) -> Bool { - return raw.kind == .unavailableFromAsyncAttributeArguments - } - - public var raw: RawSyntax - - init(raw: RawSyntax) { - precondition(Self.isKindOf(raw)) - self.raw = raw - } - - private init(unchecked raw: RawSyntax) { - self.raw = raw - } - - public init?(_ other: some RawSyntaxNodeProtocol) { - guard Self.isKindOf(other.raw) else { - return nil - } - self.init(unchecked: other.raw) - } - - public init( - _ unexpectedBeforeMessageLabel: RawUnexpectedNodesSyntax? = nil, - messageLabel: RawTokenSyntax, - _ unexpectedBetweenMessageLabelAndColon: RawUnexpectedNodesSyntax? = nil, - colon: RawTokenSyntax, - _ unexpectedBetweenColonAndMessage: RawUnexpectedNodesSyntax? = nil, - message: RawStringLiteralExprSyntax, - _ unexpectedAfterMessage: RawUnexpectedNodesSyntax? = nil, - arena: __shared RawSyntaxArena - ) { - let raw = RawSyntax.makeLayout( - kind: .unavailableFromAsyncAttributeArguments, uninitializedCount: 7, arena: arena) { layout in - layout.initialize(repeating: nil) - layout[0] = unexpectedBeforeMessageLabel?.raw - layout[1] = messageLabel.raw - layout[2] = unexpectedBetweenMessageLabelAndColon?.raw - layout[3] = colon.raw - layout[4] = unexpectedBetweenColonAndMessage?.raw - layout[5] = message.raw - layout[6] = unexpectedAfterMessage?.raw - } - self.init(unchecked: raw) - } - - public var unexpectedBeforeMessageLabel: RawUnexpectedNodesSyntax? { - layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var messageLabel: RawTokenSyntax { - layoutView.children[1].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedBetweenMessageLabelAndColon: RawUnexpectedNodesSyntax? { - layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var colon: RawTokenSyntax { - layoutView.children[3].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedBetweenColonAndMessage: RawUnexpectedNodesSyntax? { - layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var message: RawStringLiteralExprSyntax { - layoutView.children[5].map(RawStringLiteralExprSyntax.init(raw:))! - } - - public var unexpectedAfterMessage: RawUnexpectedNodesSyntax? { - layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:)) - } -} - -@_spi(RawSyntax) -public struct RawUnderscorePrivateAttributeArgumentsSyntax: RawSyntaxNodeProtocol { - @_spi(RawSyntax) - public var layoutView: RawSyntaxLayoutView { - return raw.layoutView! - } - - public static func isKindOf(_ raw: RawSyntax) -> Bool { - return raw.kind == .underscorePrivateAttributeArguments - } - - public var raw: RawSyntax - - init(raw: RawSyntax) { - precondition(Self.isKindOf(raw)) - self.raw = raw - } - - private init(unchecked raw: RawSyntax) { - self.raw = raw - } - - public init?(_ other: some RawSyntaxNodeProtocol) { - guard Self.isKindOf(other.raw) else { - return nil - } - self.init(unchecked: other.raw) - } - - public init( - _ unexpectedBeforeSourceFileLabel: RawUnexpectedNodesSyntax? = nil, - sourceFileLabel: RawTokenSyntax, - _ unexpectedBetweenSourceFileLabelAndColon: RawUnexpectedNodesSyntax? = nil, - colon: RawTokenSyntax, - _ unexpectedBetweenColonAndFilename: RawUnexpectedNodesSyntax? = nil, - filename: RawStringLiteralExprSyntax, - _ unexpectedAfterFilename: RawUnexpectedNodesSyntax? = nil, - arena: __shared RawSyntaxArena - ) { - let raw = RawSyntax.makeLayout( - kind: .underscorePrivateAttributeArguments, uninitializedCount: 7, arena: arena) { layout in - layout.initialize(repeating: nil) - layout[0] = unexpectedBeforeSourceFileLabel?.raw - layout[1] = sourceFileLabel.raw - layout[2] = unexpectedBetweenSourceFileLabelAndColon?.raw - layout[3] = colon.raw - layout[4] = unexpectedBetweenColonAndFilename?.raw - layout[5] = filename.raw - layout[6] = unexpectedAfterFilename?.raw - } - self.init(unchecked: raw) - } - - public var unexpectedBeforeSourceFileLabel: RawUnexpectedNodesSyntax? { - layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var sourceFileLabel: RawTokenSyntax { - layoutView.children[1].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedBetweenSourceFileLabelAndColon: RawUnexpectedNodesSyntax? { - layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var colon: RawTokenSyntax { - layoutView.children[3].map(RawTokenSyntax.init(raw:))! - } - - public var unexpectedBetweenColonAndFilename: RawUnexpectedNodesSyntax? { - layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:)) - } - - public var filename: RawStringLiteralExprSyntax { - layoutView.children[5].map(RawStringLiteralExprSyntax.init(raw:))! - } - - public var unexpectedAfterFilename: RawUnexpectedNodesSyntax? { - layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:)) - } -} - @_spi(RawSyntax) public struct RawUnexpectedNodesSyntax: RawSyntaxNodeProtocol { @_spi(RawSyntax) diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift index bdd1fdc99ad..bfbbbbe2053 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift @@ -821,30 +821,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.identifier)])) assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self)) } - func validateConventionAttributeArgumentsSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { - assert(layout.count == 11) - assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.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(.comma)])) - assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax?.self, tokenChoices: [.keyword("cType")])) - assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 7, verify(layout[7], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.colon)])) - assertNoError(kind, 8, verify(layout[8], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 9, verify(layout[9], as: RawStringLiteralExprSyntax?.self)) - assertNoError(kind, 10, verify(layout[10], as: RawUnexpectedNodesSyntax?.self)) - } - func validateConventionWitnessMethodAttributeArgumentsSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { - assert(layout.count == 7) - assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.keyword("witness_method")])) - 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)) - assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier)])) - assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self)) - } func validateCopyExprSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { assert(layout.count == 5) assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) @@ -1270,16 +1246,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { assertNoError(kind, 15, verify(layout[15], as: RawMemberBlockSyntax.self)) assertNoError(kind, 16, verify(layout[16], as: RawUnexpectedNodesSyntax?.self)) } - func validateExposeAttributeArgumentsSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { - assert(layout.count == 7) - assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self)) - 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)) - assertNoError(kind, 5, verify(layout[5], as: RawStringLiteralExprSyntax?.self)) - assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self)) - } func validateExprListSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { for (index, element) in layout.enumerated() { assertNoError(kind, index, verify(element, as: RawExprSyntax.self)) @@ -2197,16 +2163,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.colon)])) assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self)) } - func validateOpaqueReturnTypeOfAttributeArgumentsSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { - assert(layout.count == 7) - assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawStringLiteralExprSyntax.self)) - 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)) - assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.integerLiteral)])) - assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self)) - } func validateOperatorDeclSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { assert(layout.count == 9) assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) @@ -3004,26 +2960,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { verify(element, as: RawLifetimeTypeSpecifierSyntax.self)]) } } - func validateUnavailableFromAsyncAttributeArgumentsSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { - assert(layout.count == 7) - assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.keyword("message")])) - 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)) - assertNoError(kind, 5, verify(layout[5], as: RawStringLiteralExprSyntax.self)) - assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self)) - } - func validateUnderscorePrivateAttributeArgumentsSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { - assert(layout.count == 7) - assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) - assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.keyword("sourceFile")])) - 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)) - assertNoError(kind, 5, verify(layout[5], as: RawStringLiteralExprSyntax.self)) - assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self)) - } func validateUnexpectedNodesSyntax(kind: SyntaxKind, layout: RawSyntaxBuffer) { for (index, element) in layout.enumerated() { assertNoError(kind, index, verify(element, as: RawSyntax.self)) @@ -3300,10 +3236,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { validateConsumeExprSyntax(kind: kind, layout: layout) case .continueStmt: validateContinueStmtSyntax(kind: kind, layout: layout) - case .conventionAttributeArguments: - validateConventionAttributeArgumentsSyntax(kind: kind, layout: layout) - case .conventionWitnessMethodAttributeArguments: - validateConventionWitnessMethodAttributeArgumentsSyntax(kind: kind, layout: layout) case .copyExpr: validateCopyExprSyntax(kind: kind, layout: layout) case .declModifierDetail: @@ -3384,8 +3316,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { validateEnumCaseParameterSyntax(kind: kind, layout: layout) case .enumDecl: validateEnumDeclSyntax(kind: kind, layout: layout) - case .exposeAttributeArguments: - validateExposeAttributeArgumentsSyntax(kind: kind, layout: layout) case .exprList: validateExprListSyntax(kind: kind, layout: layout) case .expressionPattern: @@ -3562,8 +3492,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { validateObjCSelectorPieceListSyntax(kind: kind, layout: layout) case .objCSelectorPiece: validateObjCSelectorPieceSyntax(kind: kind, layout: layout) - case .opaqueReturnTypeOfAttributeArguments: - validateOpaqueReturnTypeOfAttributeArgumentsSyntax(kind: kind, layout: layout) case .operatorDecl: validateOperatorDeclSyntax(kind: kind, layout: layout) case .operatorPrecedenceAndTypes: @@ -3722,10 +3650,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { validateTypeInitializerClauseSyntax(kind: kind, layout: layout) case .typeSpecifierList: validateTypeSpecifierListSyntax(kind: kind, layout: layout) - case .unavailableFromAsyncAttributeArguments: - validateUnavailableFromAsyncAttributeArgumentsSyntax(kind: kind, layout: layout) - case .underscorePrivateAttributeArguments: - validateUnderscorePrivateAttributeArgumentsSyntax(kind: kind, layout: layout) case .unexpectedNodes: validateUnexpectedNodesSyntax(kind: kind, layout: layout) case .unresolvedAsExpr: diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift index a618d979adb..1a444b28949 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift @@ -3097,7 +3097,7 @@ public struct AttributeClauseFileSyntax: SyntaxProtocol, SyntaxHashable, _LeafSy /// - `atSign`: `@` /// - `attributeName`: ``TypeSyntax`` /// - `leftParen`: `(`? -/// - `arguments`: (``LabeledExprListSyntax`` | ``TokenSyntax`` | ``StringLiteralExprSyntax`` | ``AvailabilityArgumentListSyntax`` | ``SpecializeAttributeArgumentListSyntax`` | ``ObjCSelectorPieceListSyntax`` | ``ImplementsAttributeArgumentsSyntax`` | ``DifferentiableAttributeArgumentsSyntax`` | ``DerivativeAttributeArgumentsSyntax`` | ``BackDeployedAttributeArgumentsSyntax`` | ``ConventionAttributeArgumentsSyntax`` | ``ConventionWitnessMethodAttributeArgumentsSyntax`` | ``OpaqueReturnTypeOfAttributeArgumentsSyntax`` | ``ExposeAttributeArgumentsSyntax`` | ``OriginallyDefinedInAttributeArgumentsSyntax`` | ``UnderscorePrivateAttributeArgumentsSyntax`` | ``DynamicReplacementAttributeArgumentsSyntax`` | ``UnavailableFromAsyncAttributeArgumentsSyntax`` | ``EffectsAttributeArgumentListSyntax`` | ``DocumentationAttributeArgumentListSyntax`` | `ABIAttributeArgumentsSyntax`)? +/// - `arguments`: (``LabeledExprListSyntax`` | ``AvailabilityArgumentListSyntax`` | ``SpecializeAttributeArgumentListSyntax`` | ``ObjCSelectorPieceListSyntax`` | ``ImplementsAttributeArgumentsSyntax`` | ``DifferentiableAttributeArgumentsSyntax`` | ``DerivativeAttributeArgumentsSyntax`` | ``BackDeployedAttributeArgumentsSyntax`` | ``OriginallyDefinedInAttributeArgumentsSyntax`` | ``DynamicReplacementAttributeArgumentsSyntax`` | ``EffectsAttributeArgumentListSyntax`` | ``DocumentationAttributeArgumentListSyntax`` | `ABIAttributeArgumentsSyntax`)? /// - `rightParen`: `)`? /// /// ### Contained in @@ -3107,8 +3107,6 @@ public struct AttributeClauseFileSyntax: SyntaxProtocol, SyntaxHashable, _LeafSy public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodeProtocol { public enum Arguments: SyntaxChildChoices, SyntaxHashable { case argumentList(LabeledExprListSyntax) - case token(TokenSyntax) - case string(StringLiteralExprSyntax) case availability(AvailabilityArgumentListSyntax) case specializeArguments(SpecializeAttributeArgumentListSyntax) case objCName(ObjCSelectorPieceListSyntax) @@ -3116,14 +3114,8 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr case differentiableArguments(DifferentiableAttributeArgumentsSyntax) case derivativeRegistrationArguments(DerivativeAttributeArgumentsSyntax) case backDeployedArguments(BackDeployedAttributeArgumentsSyntax) - case conventionArguments(ConventionAttributeArgumentsSyntax) - case conventionWitnessMethodArguments(ConventionWitnessMethodAttributeArgumentsSyntax) - case opaqueReturnTypeOfAttributeArguments(OpaqueReturnTypeOfAttributeArgumentsSyntax) - case exposeAttributeArguments(ExposeAttributeArgumentsSyntax) case originallyDefinedInArguments(OriginallyDefinedInAttributeArgumentsSyntax) - case underscorePrivateAttributeArguments(UnderscorePrivateAttributeArgumentsSyntax) case dynamicReplacementArguments(DynamicReplacementAttributeArgumentsSyntax) - case unavailableFromAsyncArguments(UnavailableFromAsyncAttributeArgumentsSyntax) case effectsArguments(EffectsAttributeArgumentListSyntax) case documentationArguments(DocumentationAttributeArgumentListSyntax) /// - Note: Requires experimental feature `abiAttribute`. @@ -3134,10 +3126,6 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr switch self { case .argumentList(let node): return node._syntaxNode - case .token(let node): - return node._syntaxNode - case .string(let node): - return node._syntaxNode case .availability(let node): return node._syntaxNode case .specializeArguments(let node): @@ -3152,22 +3140,10 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr return node._syntaxNode case .backDeployedArguments(let node): return node._syntaxNode - case .conventionArguments(let node): - return node._syntaxNode - case .conventionWitnessMethodArguments(let node): - return node._syntaxNode - case .opaqueReturnTypeOfAttributeArguments(let node): - return node._syntaxNode - case .exposeAttributeArguments(let node): - return node._syntaxNode case .originallyDefinedInArguments(let node): return node._syntaxNode - case .underscorePrivateAttributeArguments(let node): - return node._syntaxNode case .dynamicReplacementArguments(let node): return node._syntaxNode - case .unavailableFromAsyncArguments(let node): - return node._syntaxNode case .effectsArguments(let node): return node._syntaxNode case .documentationArguments(let node): @@ -3181,14 +3157,6 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr self = .argumentList(node) } - public init(_ node: TokenSyntax) { - self = .token(node) - } - - public init(_ node: StringLiteralExprSyntax) { - self = .string(node) - } - public init(_ node: AvailabilityArgumentListSyntax) { self = .availability(node) } @@ -3217,38 +3185,14 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr self = .backDeployedArguments(node) } - public init(_ node: ConventionAttributeArgumentsSyntax) { - self = .conventionArguments(node) - } - - public init(_ node: ConventionWitnessMethodAttributeArgumentsSyntax) { - self = .conventionWitnessMethodArguments(node) - } - - public init(_ node: OpaqueReturnTypeOfAttributeArgumentsSyntax) { - self = .opaqueReturnTypeOfAttributeArguments(node) - } - - public init(_ node: ExposeAttributeArgumentsSyntax) { - self = .exposeAttributeArguments(node) - } - public init(_ node: OriginallyDefinedInAttributeArgumentsSyntax) { self = .originallyDefinedInArguments(node) } - public init(_ node: UnderscorePrivateAttributeArgumentsSyntax) { - self = .underscorePrivateAttributeArguments(node) - } - public init(_ node: DynamicReplacementAttributeArgumentsSyntax) { self = .dynamicReplacementArguments(node) } - public init(_ node: UnavailableFromAsyncAttributeArgumentsSyntax) { - self = .unavailableFromAsyncArguments(node) - } - public init(_ node: EffectsAttributeArgumentListSyntax) { self = .effectsArguments(node) } @@ -3266,10 +3210,6 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr public init?(_ node: __shared some SyntaxProtocol) { if let node = node.as(LabeledExprListSyntax.self) { self = .argumentList(node) - } else if let node = node.as(TokenSyntax.self) { - self = .token(node) - } else if let node = node.as(StringLiteralExprSyntax.self) { - self = .string(node) } else if let node = node.as(AvailabilityArgumentListSyntax.self) { self = .availability(node) } else if let node = node.as(SpecializeAttributeArgumentListSyntax.self) { @@ -3284,22 +3224,10 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr self = .derivativeRegistrationArguments(node) } else if let node = node.as(BackDeployedAttributeArgumentsSyntax.self) { self = .backDeployedArguments(node) - } else if let node = node.as(ConventionAttributeArgumentsSyntax.self) { - self = .conventionArguments(node) - } else if let node = node.as(ConventionWitnessMethodAttributeArgumentsSyntax.self) { - self = .conventionWitnessMethodArguments(node) - } else if let node = node.as(OpaqueReturnTypeOfAttributeArgumentsSyntax.self) { - self = .opaqueReturnTypeOfAttributeArguments(node) - } else if let node = node.as(ExposeAttributeArgumentsSyntax.self) { - self = .exposeAttributeArguments(node) } else if let node = node.as(OriginallyDefinedInAttributeArgumentsSyntax.self) { self = .originallyDefinedInArguments(node) - } else if let node = node.as(UnderscorePrivateAttributeArgumentsSyntax.self) { - self = .underscorePrivateAttributeArguments(node) } else if let node = node.as(DynamicReplacementAttributeArgumentsSyntax.self) { self = .dynamicReplacementArguments(node) - } else if let node = node.as(UnavailableFromAsyncAttributeArgumentsSyntax.self) { - self = .unavailableFromAsyncArguments(node) } else if let node = node.as(EffectsAttributeArgumentListSyntax.self) { self = .effectsArguments(node) } else if let node = node.as(DocumentationAttributeArgumentListSyntax.self) { @@ -3314,8 +3242,6 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr public static var structure: SyntaxNodeStructure { return .choices([ .node(LabeledExprListSyntax.self), - .node(TokenSyntax.self), - .node(StringLiteralExprSyntax.self), .node(AvailabilityArgumentListSyntax.self), .node(SpecializeAttributeArgumentListSyntax.self), .node(ObjCSelectorPieceListSyntax.self), @@ -3323,14 +3249,8 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr .node(DifferentiableAttributeArgumentsSyntax.self), .node(DerivativeAttributeArgumentsSyntax.self), .node(BackDeployedAttributeArgumentsSyntax.self), - .node(ConventionAttributeArgumentsSyntax.self), - .node(ConventionWitnessMethodAttributeArgumentsSyntax.self), - .node(OpaqueReturnTypeOfAttributeArgumentsSyntax.self), - .node(ExposeAttributeArgumentsSyntax.self), .node(OriginallyDefinedInAttributeArgumentsSyntax.self), - .node(UnderscorePrivateAttributeArgumentsSyntax.self), .node(DynamicReplacementAttributeArgumentsSyntax.self), - .node(UnavailableFromAsyncAttributeArgumentsSyntax.self), .node(EffectsAttributeArgumentListSyntax.self), .node(DocumentationAttributeArgumentListSyntax.self), .node(ABIAttributeArgumentsSyntax.self) @@ -3359,50 +3279,6 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr return self.as(LabeledExprListSyntax.self)! } - /// Checks if the current syntax node can be cast to ``TokenSyntax``. - /// - /// - Returns: `true` if the node can be cast, `false` otherwise. - public func `is`(_ syntaxType: TokenSyntax.Type) -> Bool { - return self.as(syntaxType) != nil - } - - /// Attempts to cast the current syntax node to ``TokenSyntax``. - /// - /// - Returns: An instance of ``TokenSyntax``, or `nil` if the cast fails. - public func `as`(_ syntaxType: TokenSyntax.Type) -> TokenSyntax? { - return TokenSyntax.init(self) - } - - /// Force-casts the current syntax node to ``TokenSyntax``. - /// - /// - Returns: An instance of ``TokenSyntax``. - /// - Warning: This function will crash if the cast is not possible. Use `as` to safely attempt a cast. - public func cast(_ syntaxType: TokenSyntax.Type) -> TokenSyntax { - return self.as(TokenSyntax.self)! - } - - /// Checks if the current syntax node can be cast to ``StringLiteralExprSyntax``. - /// - /// - Returns: `true` if the node can be cast, `false` otherwise. - public func `is`(_ syntaxType: StringLiteralExprSyntax.Type) -> Bool { - return self.as(syntaxType) != nil - } - - /// Attempts to cast the current syntax node to ``StringLiteralExprSyntax``. - /// - /// - Returns: An instance of ``StringLiteralExprSyntax``, or `nil` if the cast fails. - public func `as`(_ syntaxType: StringLiteralExprSyntax.Type) -> StringLiteralExprSyntax? { - return StringLiteralExprSyntax.init(self) - } - - /// Force-casts the current syntax node to ``StringLiteralExprSyntax``. - /// - /// - Returns: An instance of ``StringLiteralExprSyntax``. - /// - Warning: This function will crash if the cast is not possible. Use `as` to safely attempt a cast. - public func cast(_ syntaxType: StringLiteralExprSyntax.Type) -> StringLiteralExprSyntax { - return self.as(StringLiteralExprSyntax.self)! - } - /// Checks if the current syntax node can be cast to ``AvailabilityArgumentListSyntax``. /// /// - Returns: `true` if the node can be cast, `false` otherwise. @@ -3557,94 +3433,6 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr return self.as(BackDeployedAttributeArgumentsSyntax.self)! } - /// Checks if the current syntax node can be cast to ``ConventionAttributeArgumentsSyntax``. - /// - /// - Returns: `true` if the node can be cast, `false` otherwise. - public func `is`(_ syntaxType: ConventionAttributeArgumentsSyntax.Type) -> Bool { - return self.as(syntaxType) != nil - } - - /// Attempts to cast the current syntax node to ``ConventionAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``ConventionAttributeArgumentsSyntax``, or `nil` if the cast fails. - public func `as`(_ syntaxType: ConventionAttributeArgumentsSyntax.Type) -> ConventionAttributeArgumentsSyntax? { - return ConventionAttributeArgumentsSyntax.init(self) - } - - /// Force-casts the current syntax node to ``ConventionAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``ConventionAttributeArgumentsSyntax``. - /// - Warning: This function will crash if the cast is not possible. Use `as` to safely attempt a cast. - public func cast(_ syntaxType: ConventionAttributeArgumentsSyntax.Type) -> ConventionAttributeArgumentsSyntax { - return self.as(ConventionAttributeArgumentsSyntax.self)! - } - - /// Checks if the current syntax node can be cast to ``ConventionWitnessMethodAttributeArgumentsSyntax``. - /// - /// - Returns: `true` if the node can be cast, `false` otherwise. - public func `is`(_ syntaxType: ConventionWitnessMethodAttributeArgumentsSyntax.Type) -> Bool { - return self.as(syntaxType) != nil - } - - /// Attempts to cast the current syntax node to ``ConventionWitnessMethodAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``ConventionWitnessMethodAttributeArgumentsSyntax``, or `nil` if the cast fails. - public func `as`(_ syntaxType: ConventionWitnessMethodAttributeArgumentsSyntax.Type) -> ConventionWitnessMethodAttributeArgumentsSyntax? { - return ConventionWitnessMethodAttributeArgumentsSyntax.init(self) - } - - /// Force-casts the current syntax node to ``ConventionWitnessMethodAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``ConventionWitnessMethodAttributeArgumentsSyntax``. - /// - Warning: This function will crash if the cast is not possible. Use `as` to safely attempt a cast. - public func cast(_ syntaxType: ConventionWitnessMethodAttributeArgumentsSyntax.Type) -> ConventionWitnessMethodAttributeArgumentsSyntax { - return self.as(ConventionWitnessMethodAttributeArgumentsSyntax.self)! - } - - /// Checks if the current syntax node can be cast to ``OpaqueReturnTypeOfAttributeArgumentsSyntax``. - /// - /// - Returns: `true` if the node can be cast, `false` otherwise. - public func `is`(_ syntaxType: OpaqueReturnTypeOfAttributeArgumentsSyntax.Type) -> Bool { - return self.as(syntaxType) != nil - } - - /// Attempts to cast the current syntax node to ``OpaqueReturnTypeOfAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``OpaqueReturnTypeOfAttributeArgumentsSyntax``, or `nil` if the cast fails. - public func `as`(_ syntaxType: OpaqueReturnTypeOfAttributeArgumentsSyntax.Type) -> OpaqueReturnTypeOfAttributeArgumentsSyntax? { - return OpaqueReturnTypeOfAttributeArgumentsSyntax.init(self) - } - - /// Force-casts the current syntax node to ``OpaqueReturnTypeOfAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``OpaqueReturnTypeOfAttributeArgumentsSyntax``. - /// - Warning: This function will crash if the cast is not possible. Use `as` to safely attempt a cast. - public func cast(_ syntaxType: OpaqueReturnTypeOfAttributeArgumentsSyntax.Type) -> OpaqueReturnTypeOfAttributeArgumentsSyntax { - return self.as(OpaqueReturnTypeOfAttributeArgumentsSyntax.self)! - } - - /// Checks if the current syntax node can be cast to ``ExposeAttributeArgumentsSyntax``. - /// - /// - Returns: `true` if the node can be cast, `false` otherwise. - public func `is`(_ syntaxType: ExposeAttributeArgumentsSyntax.Type) -> Bool { - return self.as(syntaxType) != nil - } - - /// Attempts to cast the current syntax node to ``ExposeAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``ExposeAttributeArgumentsSyntax``, or `nil` if the cast fails. - public func `as`(_ syntaxType: ExposeAttributeArgumentsSyntax.Type) -> ExposeAttributeArgumentsSyntax? { - return ExposeAttributeArgumentsSyntax.init(self) - } - - /// Force-casts the current syntax node to ``ExposeAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``ExposeAttributeArgumentsSyntax``. - /// - Warning: This function will crash if the cast is not possible. Use `as` to safely attempt a cast. - public func cast(_ syntaxType: ExposeAttributeArgumentsSyntax.Type) -> ExposeAttributeArgumentsSyntax { - return self.as(ExposeAttributeArgumentsSyntax.self)! - } - /// Checks if the current syntax node can be cast to ``OriginallyDefinedInAttributeArgumentsSyntax``. /// /// - Returns: `true` if the node can be cast, `false` otherwise. @@ -3667,28 +3455,6 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr return self.as(OriginallyDefinedInAttributeArgumentsSyntax.self)! } - /// Checks if the current syntax node can be cast to ``UnderscorePrivateAttributeArgumentsSyntax``. - /// - /// - Returns: `true` if the node can be cast, `false` otherwise. - public func `is`(_ syntaxType: UnderscorePrivateAttributeArgumentsSyntax.Type) -> Bool { - return self.as(syntaxType) != nil - } - - /// Attempts to cast the current syntax node to ``UnderscorePrivateAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``UnderscorePrivateAttributeArgumentsSyntax``, or `nil` if the cast fails. - public func `as`(_ syntaxType: UnderscorePrivateAttributeArgumentsSyntax.Type) -> UnderscorePrivateAttributeArgumentsSyntax? { - return UnderscorePrivateAttributeArgumentsSyntax.init(self) - } - - /// Force-casts the current syntax node to ``UnderscorePrivateAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``UnderscorePrivateAttributeArgumentsSyntax``. - /// - Warning: This function will crash if the cast is not possible. Use `as` to safely attempt a cast. - public func cast(_ syntaxType: UnderscorePrivateAttributeArgumentsSyntax.Type) -> UnderscorePrivateAttributeArgumentsSyntax { - return self.as(UnderscorePrivateAttributeArgumentsSyntax.self)! - } - /// Checks if the current syntax node can be cast to ``DynamicReplacementAttributeArgumentsSyntax``. /// /// - Returns: `true` if the node can be cast, `false` otherwise. @@ -3711,28 +3477,6 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodePr return self.as(DynamicReplacementAttributeArgumentsSyntax.self)! } - /// Checks if the current syntax node can be cast to ``UnavailableFromAsyncAttributeArgumentsSyntax``. - /// - /// - Returns: `true` if the node can be cast, `false` otherwise. - public func `is`(_ syntaxType: UnavailableFromAsyncAttributeArgumentsSyntax.Type) -> Bool { - return self.as(syntaxType) != nil - } - - /// Attempts to cast the current syntax node to ``UnavailableFromAsyncAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``UnavailableFromAsyncAttributeArgumentsSyntax``, or `nil` if the cast fails. - public func `as`(_ syntaxType: UnavailableFromAsyncAttributeArgumentsSyntax.Type) -> UnavailableFromAsyncAttributeArgumentsSyntax? { - return UnavailableFromAsyncAttributeArgumentsSyntax.init(self) - } - - /// Force-casts the current syntax node to ``UnavailableFromAsyncAttributeArgumentsSyntax``. - /// - /// - Returns: An instance of ``UnavailableFromAsyncAttributeArgumentsSyntax``. - /// - Warning: This function will crash if the cast is not possible. Use `as` to safely attempt a cast. - public func cast(_ syntaxType: UnavailableFromAsyncAttributeArgumentsSyntax.Type) -> UnavailableFromAsyncAttributeArgumentsSyntax { - return self.as(UnavailableFromAsyncAttributeArgumentsSyntax.self)! - } - /// Checks if the current syntax node can be cast to ``EffectsAttributeArgumentListSyntax``. /// /// - Returns: `true` if the node can be cast, `false` otherwise. diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesC.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesC.swift index e8873066ac2..0c1de3f319e 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesC.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesC.swift @@ -4385,387 +4385,6 @@ public struct ContinueStmtSyntax: StmtSyntaxProtocol, SyntaxHashable, _LeafStmtS ]) } -// MARK: - ConventionAttributeArgumentsSyntax - -/// The arguments for the '@convention(...)'. -/// -/// ### Children -/// -/// - `conventionLabel`: `` -/// - `comma`: `,`? -/// - `cTypeLabel`: `cType`? -/// - `colon`: `:`? -/// - `cTypeString`: ``StringLiteralExprSyntax``? -/// -/// ### Contained in -/// -/// - ``AttributeSyntax``.``AttributeSyntax/arguments`` -public struct ConventionAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodeProtocol { - public let _syntaxNode: Syntax - - public init?(_ node: __shared some SyntaxProtocol) { - guard node.raw.kind == .conventionAttributeArguments else { - return nil - } - self._syntaxNode = node._syntaxNode - } - - @_transparent - init(unsafeCasting node: Syntax) { - self._syntaxNode = node - } - - /// - Parameters: - /// - leadingTrivia: Trivia to be prepended to the leading trivia of the node’s first token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - /// - conventionLabel: The convention label. - /// - trailingTrivia: Trivia to be appended to the trailing trivia of the node’s last token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - public init( - leadingTrivia: Trivia? = nil, - _ unexpectedBeforeConventionLabel: UnexpectedNodesSyntax? = nil, - conventionLabel: TokenSyntax, - _ unexpectedBetweenConventionLabelAndComma: UnexpectedNodesSyntax? = nil, - comma: TokenSyntax? = nil, - _ unexpectedBetweenCommaAndCTypeLabel: UnexpectedNodesSyntax? = nil, - cTypeLabel: TokenSyntax? = nil, - _ unexpectedBetweenCTypeLabelAndColon: UnexpectedNodesSyntax? = nil, - colon: TokenSyntax? = nil, - _ unexpectedBetweenColonAndCTypeString: UnexpectedNodesSyntax? = nil, - cTypeString: StringLiteralExprSyntax? = nil, - _ unexpectedAfterCTypeString: UnexpectedNodesSyntax? = nil, - trailingTrivia: Trivia? = nil - ) { - // Extend the lifetime of all parameters so their arenas don't get destroyed - // before they can be added as children of the new arena. - self = withExtendedLifetime((RawSyntaxArena(), ( - unexpectedBeforeConventionLabel, - conventionLabel, - unexpectedBetweenConventionLabelAndComma, - comma, - unexpectedBetweenCommaAndCTypeLabel, - cTypeLabel, - unexpectedBetweenCTypeLabelAndColon, - colon, - unexpectedBetweenColonAndCTypeString, - cTypeString, - unexpectedAfterCTypeString - ))) { (arena, _) in - let layout: [RawSyntax?] = [ - unexpectedBeforeConventionLabel?.raw, - conventionLabel.raw, - unexpectedBetweenConventionLabelAndComma?.raw, - comma?.raw, - unexpectedBetweenCommaAndCTypeLabel?.raw, - cTypeLabel?.raw, - unexpectedBetweenCTypeLabelAndColon?.raw, - colon?.raw, - unexpectedBetweenColonAndCTypeString?.raw, - cTypeString?.raw, - unexpectedAfterCTypeString?.raw - ] - let raw = RawSyntax.makeLayout( - kind: SyntaxKind.conventionAttributeArguments, - from: layout, - arena: arena, - leadingTrivia: leadingTrivia, - trailingTrivia: trailingTrivia - ) - return Syntax.forRoot(raw, rawNodeArena: arena).cast(Self.self) - } - } - - public var unexpectedBeforeConventionLabel: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 0)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 0, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - /// The convention label. - /// - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be ``. - public var conventionLabel: TokenSyntax { - get { - return Syntax(self).child(at: 1)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 1, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenConventionLabelAndComma: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 2)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 2, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `,`. - public var comma: TokenSyntax? { - get { - return Syntax(self).child(at: 3)?.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 3, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenCommaAndCTypeLabel: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 4)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 4, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `cType`. - public var cTypeLabel: TokenSyntax? { - get { - return Syntax(self).child(at: 5)?.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 5, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenCTypeLabelAndColon: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 6)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 6, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `:`. - public var colon: TokenSyntax? { - get { - return Syntax(self).child(at: 7)?.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 7, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenColonAndCTypeString: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 8)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 8, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - public var cTypeString: StringLiteralExprSyntax? { - get { - return Syntax(self).child(at: 9)?.cast(StringLiteralExprSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 9, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - public var unexpectedAfterCTypeString: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 10)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 10, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionAttributeArgumentsSyntax.self) - } - } - - public static let structure: SyntaxNodeStructure = .layout([ - \Self.unexpectedBeforeConventionLabel, - \Self.conventionLabel, - \Self.unexpectedBetweenConventionLabelAndComma, - \Self.comma, - \Self.unexpectedBetweenCommaAndCTypeLabel, - \Self.cTypeLabel, - \Self.unexpectedBetweenCTypeLabelAndColon, - \Self.colon, - \Self.unexpectedBetweenColonAndCTypeString, - \Self.cTypeString, - \Self.unexpectedAfterCTypeString - ]) -} - -// MARK: - ConventionWitnessMethodAttributeArgumentsSyntax - -/// The arguments for the '@convention(witness_method: ...)'. -/// -/// ### Children -/// -/// - `witnessMethodLabel`: `witness_method` -/// - `colon`: `:` -/// - `protocolName`: `` -/// -/// ### Contained in -/// -/// - ``AttributeSyntax``.``AttributeSyntax/arguments`` -public struct ConventionWitnessMethodAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodeProtocol { - public let _syntaxNode: Syntax - - public init?(_ node: __shared some SyntaxProtocol) { - guard node.raw.kind == .conventionWitnessMethodAttributeArguments else { - return nil - } - self._syntaxNode = node._syntaxNode - } - - @_transparent - init(unsafeCasting node: Syntax) { - self._syntaxNode = node - } - - /// - Parameters: - /// - leadingTrivia: Trivia to be prepended to the leading trivia of the node’s first token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - /// - witnessMethodLabel: The `witnessMethod` label. - /// - colon: The colon separating the `witnessMethod` label and the original protocol name. - /// - protocolName: The original protocol name. - /// - trailingTrivia: Trivia to be appended to the trailing trivia of the node’s last token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - public init( - leadingTrivia: Trivia? = nil, - _ unexpectedBeforeWitnessMethodLabel: UnexpectedNodesSyntax? = nil, - witnessMethodLabel: TokenSyntax = .keyword(.witness_method), - _ unexpectedBetweenWitnessMethodLabelAndColon: UnexpectedNodesSyntax? = nil, - colon: TokenSyntax = .colonToken(), - _ unexpectedBetweenColonAndProtocolName: UnexpectedNodesSyntax? = nil, - protocolName: TokenSyntax, - _ unexpectedAfterProtocolName: UnexpectedNodesSyntax? = nil, - trailingTrivia: Trivia? = nil - ) { - // Extend the lifetime of all parameters so their arenas don't get destroyed - // before they can be added as children of the new arena. - self = withExtendedLifetime((RawSyntaxArena(), ( - unexpectedBeforeWitnessMethodLabel, - witnessMethodLabel, - unexpectedBetweenWitnessMethodLabelAndColon, - colon, - unexpectedBetweenColonAndProtocolName, - protocolName, - unexpectedAfterProtocolName - ))) { (arena, _) in - let layout: [RawSyntax?] = [ - unexpectedBeforeWitnessMethodLabel?.raw, - witnessMethodLabel.raw, - unexpectedBetweenWitnessMethodLabelAndColon?.raw, - colon.raw, - unexpectedBetweenColonAndProtocolName?.raw, - protocolName.raw, - unexpectedAfterProtocolName?.raw - ] - let raw = RawSyntax.makeLayout( - kind: SyntaxKind.conventionWitnessMethodAttributeArguments, - from: layout, - arena: arena, - leadingTrivia: leadingTrivia, - trailingTrivia: trailingTrivia - ) - return Syntax.forRoot(raw, rawNodeArena: arena).cast(Self.self) - } - } - - public var unexpectedBeforeWitnessMethodLabel: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 0)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 0, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionWitnessMethodAttributeArgumentsSyntax.self) - } - } - - /// The `witnessMethod` label. - /// - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `witness_method`. - public var witnessMethodLabel: TokenSyntax { - get { - return Syntax(self).child(at: 1)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 1, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionWitnessMethodAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenWitnessMethodLabelAndColon: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 2)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 2, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionWitnessMethodAttributeArgumentsSyntax.self) - } - } - - /// The colon separating the `witnessMethod` label and the original protocol name. - /// - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `:`. - public var colon: TokenSyntax { - get { - return Syntax(self).child(at: 3)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 3, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionWitnessMethodAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenColonAndProtocolName: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 4)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 4, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionWitnessMethodAttributeArgumentsSyntax.self) - } - } - - /// The original protocol name. - /// - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be ``. - public var protocolName: TokenSyntax { - get { - return Syntax(self).child(at: 5)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 5, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionWitnessMethodAttributeArgumentsSyntax.self) - } - } - - public var unexpectedAfterProtocolName: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 6)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 6, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ConventionWitnessMethodAttributeArgumentsSyntax.self) - } - } - - public static let structure: SyntaxNodeStructure = .layout([ - \Self.unexpectedBeforeWitnessMethodLabel, - \Self.witnessMethodLabel, - \Self.unexpectedBetweenWitnessMethodLabelAndColon, - \Self.colon, - \Self.unexpectedBetweenColonAndProtocolName, - \Self.protocolName, - \Self.unexpectedAfterProtocolName - ]) -} - // MARK: - CopyExprSyntax /// ### Children diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift index f56998d366c..2c9f89946cf 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift @@ -1603,156 +1603,6 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _LeafDeclSynta ]) } -// MARK: - ExposeAttributeArgumentsSyntax - -/// The arguments for the '@_expose' attribute -/// -/// ### Children -/// -/// - `language`: ``TokenSyntax`` -/// - `comma`: `,`? -/// - `cxxName`: ``StringLiteralExprSyntax``? -/// -/// ### Contained in -/// -/// - ``AttributeSyntax``.``AttributeSyntax/arguments`` -public struct ExposeAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodeProtocol { - public let _syntaxNode: Syntax - - public init?(_ node: __shared some SyntaxProtocol) { - guard node.raw.kind == .exposeAttributeArguments else { - return nil - } - self._syntaxNode = node._syntaxNode - } - - @_transparent - init(unsafeCasting node: Syntax) { - self._syntaxNode = node - } - - /// - Parameters: - /// - leadingTrivia: Trivia to be prepended to the leading trivia of the node’s first token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - /// - trailingTrivia: Trivia to be appended to the trailing trivia of the node’s last token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - public init( - leadingTrivia: Trivia? = nil, - _ unexpectedBeforeLanguage: UnexpectedNodesSyntax? = nil, - language: TokenSyntax, - _ unexpectedBetweenLanguageAndComma: UnexpectedNodesSyntax? = nil, - comma: TokenSyntax? = nil, - _ unexpectedBetweenCommaAndCxxName: UnexpectedNodesSyntax? = nil, - cxxName: StringLiteralExprSyntax? = nil, - _ unexpectedAfterCxxName: UnexpectedNodesSyntax? = nil, - trailingTrivia: Trivia? = nil - ) { - // Extend the lifetime of all parameters so their arenas don't get destroyed - // before they can be added as children of the new arena. - self = withExtendedLifetime((RawSyntaxArena(), ( - unexpectedBeforeLanguage, - language, - unexpectedBetweenLanguageAndComma, - comma, - unexpectedBetweenCommaAndCxxName, - cxxName, - unexpectedAfterCxxName - ))) { (arena, _) in - let layout: [RawSyntax?] = [ - unexpectedBeforeLanguage?.raw, - language.raw, - unexpectedBetweenLanguageAndComma?.raw, - comma?.raw, - unexpectedBetweenCommaAndCxxName?.raw, - cxxName?.raw, - unexpectedAfterCxxName?.raw - ] - let raw = RawSyntax.makeLayout( - kind: SyntaxKind.exposeAttributeArguments, - from: layout, - arena: arena, - leadingTrivia: leadingTrivia, - trailingTrivia: trailingTrivia - ) - return Syntax.forRoot(raw, rawNodeArena: arena).cast(Self.self) - } - } - - public var unexpectedBeforeLanguage: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 0)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 0, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ExposeAttributeArgumentsSyntax.self) - } - } - - public var language: TokenSyntax { - get { - return Syntax(self).child(at: 1)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 1, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ExposeAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenLanguageAndComma: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 2)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 2, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ExposeAttributeArgumentsSyntax.self) - } - } - - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `,`. - public var comma: TokenSyntax? { - get { - return Syntax(self).child(at: 3)?.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 3, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ExposeAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenCommaAndCxxName: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 4)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 4, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ExposeAttributeArgumentsSyntax.self) - } - } - - public var cxxName: StringLiteralExprSyntax? { - get { - return Syntax(self).child(at: 5)?.cast(StringLiteralExprSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 5, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ExposeAttributeArgumentsSyntax.self) - } - } - - public var unexpectedAfterCxxName: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 6)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 6, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(ExposeAttributeArgumentsSyntax.self) - } - } - - public static let structure: SyntaxNodeStructure = .layout([ - \Self.unexpectedBeforeLanguage, - \Self.language, - \Self.unexpectedBetweenLanguageAndComma, - \Self.comma, - \Self.unexpectedBetweenCommaAndCxxName, - \Self.cxxName, - \Self.unexpectedAfterCxxName - ]) -} - // MARK: - ExpressionPatternSyntax /// A pattern that contains an ``ExprSyntaxProtocol``. diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesOP.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesOP.swift index eded78ece74..3e58d1c85e6 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesOP.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesOP.swift @@ -141,164 +141,6 @@ public struct ObjCSelectorPieceSyntax: SyntaxProtocol, SyntaxHashable, _LeafSynt ]) } -// MARK: - OpaqueReturnTypeOfAttributeArgumentsSyntax - -/// The arguments for the '@_opaqueReturnTypeOf()'. -/// -/// ### Children -/// -/// - `mangledName`: ``StringLiteralExprSyntax`` -/// - `comma`: `,` -/// - `ordinal`: `` -/// -/// ### Contained in -/// -/// - ``AttributeSyntax``.``AttributeSyntax/arguments`` -public struct OpaqueReturnTypeOfAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodeProtocol { - public let _syntaxNode: Syntax - - public init?(_ node: __shared some SyntaxProtocol) { - guard node.raw.kind == .opaqueReturnTypeOfAttributeArguments else { - return nil - } - self._syntaxNode = node._syntaxNode - } - - @_transparent - init(unsafeCasting node: Syntax) { - self._syntaxNode = node - } - - /// - Parameters: - /// - leadingTrivia: Trivia to be prepended to the leading trivia of the node’s first token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - /// - mangledName: The mangled name of a declaration. - /// - ordinal: The ordinal corresponding to the 'some' keyword that introduced this opaque type. - /// - trailingTrivia: Trivia to be appended to the trailing trivia of the node’s last token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - public init( - leadingTrivia: Trivia? = nil, - _ unexpectedBeforeMangledName: UnexpectedNodesSyntax? = nil, - mangledName: StringLiteralExprSyntax, - _ unexpectedBetweenMangledNameAndComma: UnexpectedNodesSyntax? = nil, - comma: TokenSyntax = .commaToken(), - _ unexpectedBetweenCommaAndOrdinal: UnexpectedNodesSyntax? = nil, - ordinal: TokenSyntax, - _ unexpectedAfterOrdinal: UnexpectedNodesSyntax? = nil, - trailingTrivia: Trivia? = nil - ) { - // Extend the lifetime of all parameters so their arenas don't get destroyed - // before they can be added as children of the new arena. - self = withExtendedLifetime((RawSyntaxArena(), ( - unexpectedBeforeMangledName, - mangledName, - unexpectedBetweenMangledNameAndComma, - comma, - unexpectedBetweenCommaAndOrdinal, - ordinal, - unexpectedAfterOrdinal - ))) { (arena, _) in - let layout: [RawSyntax?] = [ - unexpectedBeforeMangledName?.raw, - mangledName.raw, - unexpectedBetweenMangledNameAndComma?.raw, - comma.raw, - unexpectedBetweenCommaAndOrdinal?.raw, - ordinal.raw, - unexpectedAfterOrdinal?.raw - ] - let raw = RawSyntax.makeLayout( - kind: SyntaxKind.opaqueReturnTypeOfAttributeArguments, - from: layout, - arena: arena, - leadingTrivia: leadingTrivia, - trailingTrivia: trailingTrivia - ) - return Syntax.forRoot(raw, rawNodeArena: arena).cast(Self.self) - } - } - - public var unexpectedBeforeMangledName: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 0)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 0, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(OpaqueReturnTypeOfAttributeArgumentsSyntax.self) - } - } - - /// The mangled name of a declaration. - public var mangledName: StringLiteralExprSyntax { - get { - return Syntax(self).child(at: 1)!.cast(StringLiteralExprSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 1, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(OpaqueReturnTypeOfAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenMangledNameAndComma: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 2)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 2, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(OpaqueReturnTypeOfAttributeArgumentsSyntax.self) - } - } - - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `,`. - public var comma: TokenSyntax { - get { - return Syntax(self).child(at: 3)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 3, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(OpaqueReturnTypeOfAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenCommaAndOrdinal: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 4)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 4, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(OpaqueReturnTypeOfAttributeArgumentsSyntax.self) - } - } - - /// The ordinal corresponding to the 'some' keyword that introduced this opaque type. - /// - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be ``. - public var ordinal: TokenSyntax { - get { - return Syntax(self).child(at: 5)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 5, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(OpaqueReturnTypeOfAttributeArgumentsSyntax.self) - } - } - - public var unexpectedAfterOrdinal: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 6)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 6, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(OpaqueReturnTypeOfAttributeArgumentsSyntax.self) - } - } - - public static let structure: SyntaxNodeStructure = .layout([ - \Self.unexpectedBeforeMangledName, - \Self.mangledName, - \Self.unexpectedBetweenMangledNameAndComma, - \Self.comma, - \Self.unexpectedBetweenCommaAndOrdinal, - \Self.ordinal, - \Self.unexpectedAfterOrdinal - ]) -} - // MARK: - OperatorDeclSyntax /// A Swift `operator` declaration. diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesQRS.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesQRS.swift index 14d229cf2d3..64bf6bd06cf 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesQRS.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesQRS.swift @@ -2103,14 +2103,8 @@ public struct SpecializeTargetFunctionArgumentSyntax: SyntaxProtocol, SyntaxHash /// /// ### Contained in /// -/// - ``AttributeSyntax``.``AttributeSyntax/arguments`` -/// - ``ConventionAttributeArgumentsSyntax``.``ConventionAttributeArgumentsSyntax/cTypeString`` /// - ``DocumentationAttributeArgumentSyntax``.``DocumentationAttributeArgumentSyntax/value`` -/// - ``ExposeAttributeArgumentsSyntax``.``ExposeAttributeArgumentsSyntax/cxxName`` -/// - ``OpaqueReturnTypeOfAttributeArgumentsSyntax``.``OpaqueReturnTypeOfAttributeArgumentsSyntax/mangledName`` /// - ``OriginallyDefinedInAttributeArgumentsSyntax``.``OriginallyDefinedInAttributeArgumentsSyntax/moduleName`` -/// - ``UnavailableFromAsyncAttributeArgumentsSyntax``.``UnavailableFromAsyncAttributeArgumentsSyntax/message`` -/// - ``UnderscorePrivateAttributeArgumentsSyntax``.``UnderscorePrivateAttributeArgumentsSyntax/filename`` public struct StringLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable, _LeafExprSyntaxNodeProtocol { public let _syntaxNode: Syntax diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift index 87ac2d7cae0..88aa709709f 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift @@ -2602,312 +2602,6 @@ public struct TypeInitializerClauseSyntax: SyntaxProtocol, SyntaxHashable, _Leaf ]) } -// MARK: - UnavailableFromAsyncAttributeArgumentsSyntax - -/// The arguments for the '@_unavailableFromAsync' attribute -/// -/// ### Children -/// -/// - `messageLabel`: `message` -/// - `colon`: `:` -/// - `message`: ``StringLiteralExprSyntax`` -/// -/// ### Contained in -/// -/// - ``AttributeSyntax``.``AttributeSyntax/arguments`` -public struct UnavailableFromAsyncAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodeProtocol { - public let _syntaxNode: Syntax - - public init?(_ node: __shared some SyntaxProtocol) { - guard node.raw.kind == .unavailableFromAsyncAttributeArguments else { - return nil - } - self._syntaxNode = node._syntaxNode - } - - @_transparent - init(unsafeCasting node: Syntax) { - self._syntaxNode = node - } - - /// - Parameters: - /// - leadingTrivia: Trivia to be prepended to the leading trivia of the node’s first token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - /// - trailingTrivia: Trivia to be appended to the trailing trivia of the node’s last token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - public init( - leadingTrivia: Trivia? = nil, - _ unexpectedBeforeMessageLabel: UnexpectedNodesSyntax? = nil, - messageLabel: TokenSyntax = .keyword(.message), - _ unexpectedBetweenMessageLabelAndColon: UnexpectedNodesSyntax? = nil, - colon: TokenSyntax = .colonToken(), - _ unexpectedBetweenColonAndMessage: UnexpectedNodesSyntax? = nil, - message: StringLiteralExprSyntax, - _ unexpectedAfterMessage: UnexpectedNodesSyntax? = nil, - trailingTrivia: Trivia? = nil - ) { - // Extend the lifetime of all parameters so their arenas don't get destroyed - // before they can be added as children of the new arena. - self = withExtendedLifetime((RawSyntaxArena(), ( - unexpectedBeforeMessageLabel, - messageLabel, - unexpectedBetweenMessageLabelAndColon, - colon, - unexpectedBetweenColonAndMessage, - message, - unexpectedAfterMessage - ))) { (arena, _) in - let layout: [RawSyntax?] = [ - unexpectedBeforeMessageLabel?.raw, - messageLabel.raw, - unexpectedBetweenMessageLabelAndColon?.raw, - colon.raw, - unexpectedBetweenColonAndMessage?.raw, - message.raw, - unexpectedAfterMessage?.raw - ] - let raw = RawSyntax.makeLayout( - kind: SyntaxKind.unavailableFromAsyncAttributeArguments, - from: layout, - arena: arena, - leadingTrivia: leadingTrivia, - trailingTrivia: trailingTrivia - ) - return Syntax.forRoot(raw, rawNodeArena: arena).cast(Self.self) - } - } - - public var unexpectedBeforeMessageLabel: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 0)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 0, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnavailableFromAsyncAttributeArgumentsSyntax.self) - } - } - - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `message`. - public var messageLabel: TokenSyntax { - get { - return Syntax(self).child(at: 1)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 1, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnavailableFromAsyncAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenMessageLabelAndColon: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 2)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 2, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnavailableFromAsyncAttributeArgumentsSyntax.self) - } - } - - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `:`. - public var colon: TokenSyntax { - get { - return Syntax(self).child(at: 3)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 3, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnavailableFromAsyncAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenColonAndMessage: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 4)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 4, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnavailableFromAsyncAttributeArgumentsSyntax.self) - } - } - - public var message: StringLiteralExprSyntax { - get { - return Syntax(self).child(at: 5)!.cast(StringLiteralExprSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 5, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnavailableFromAsyncAttributeArgumentsSyntax.self) - } - } - - public var unexpectedAfterMessage: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 6)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 6, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnavailableFromAsyncAttributeArgumentsSyntax.self) - } - } - - public static let structure: SyntaxNodeStructure = .layout([ - \Self.unexpectedBeforeMessageLabel, - \Self.messageLabel, - \Self.unexpectedBetweenMessageLabelAndColon, - \Self.colon, - \Self.unexpectedBetweenColonAndMessage, - \Self.message, - \Self.unexpectedAfterMessage - ]) -} - -// MARK: - UnderscorePrivateAttributeArgumentsSyntax - -/// The arguments for the '@_private' attribute -/// -/// ### Children -/// -/// - `sourceFileLabel`: `sourceFile` -/// - `colon`: `:` -/// - `filename`: ``StringLiteralExprSyntax`` -/// -/// ### Contained in -/// -/// - ``AttributeSyntax``.``AttributeSyntax/arguments`` -public struct UnderscorePrivateAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNodeProtocol { - public let _syntaxNode: Syntax - - public init?(_ node: __shared some SyntaxProtocol) { - guard node.raw.kind == .underscorePrivateAttributeArguments else { - return nil - } - self._syntaxNode = node._syntaxNode - } - - @_transparent - init(unsafeCasting node: Syntax) { - self._syntaxNode = node - } - - /// - Parameters: - /// - leadingTrivia: Trivia to be prepended to the leading trivia of the node’s first token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - /// - trailingTrivia: Trivia to be appended to the trailing trivia of the node’s last token. If the node is empty, there is no token to attach the trivia to and the parameter is ignored. - public init( - leadingTrivia: Trivia? = nil, - _ unexpectedBeforeSourceFileLabel: UnexpectedNodesSyntax? = nil, - sourceFileLabel: TokenSyntax = .keyword(.sourceFile), - _ unexpectedBetweenSourceFileLabelAndColon: UnexpectedNodesSyntax? = nil, - colon: TokenSyntax = .colonToken(), - _ unexpectedBetweenColonAndFilename: UnexpectedNodesSyntax? = nil, - filename: StringLiteralExprSyntax, - _ unexpectedAfterFilename: UnexpectedNodesSyntax? = nil, - trailingTrivia: Trivia? = nil - ) { - // Extend the lifetime of all parameters so their arenas don't get destroyed - // before they can be added as children of the new arena. - self = withExtendedLifetime((RawSyntaxArena(), ( - unexpectedBeforeSourceFileLabel, - sourceFileLabel, - unexpectedBetweenSourceFileLabelAndColon, - colon, - unexpectedBetweenColonAndFilename, - filename, - unexpectedAfterFilename - ))) { (arena, _) in - let layout: [RawSyntax?] = [ - unexpectedBeforeSourceFileLabel?.raw, - sourceFileLabel.raw, - unexpectedBetweenSourceFileLabelAndColon?.raw, - colon.raw, - unexpectedBetweenColonAndFilename?.raw, - filename.raw, - unexpectedAfterFilename?.raw - ] - let raw = RawSyntax.makeLayout( - kind: SyntaxKind.underscorePrivateAttributeArguments, - from: layout, - arena: arena, - leadingTrivia: leadingTrivia, - trailingTrivia: trailingTrivia - ) - return Syntax.forRoot(raw, rawNodeArena: arena).cast(Self.self) - } - } - - public var unexpectedBeforeSourceFileLabel: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 0)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 0, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnderscorePrivateAttributeArgumentsSyntax.self) - } - } - - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `sourceFile`. - public var sourceFileLabel: TokenSyntax { - get { - return Syntax(self).child(at: 1)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 1, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnderscorePrivateAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenSourceFileLabelAndColon: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 2)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 2, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnderscorePrivateAttributeArgumentsSyntax.self) - } - } - - /// ### Tokens - /// - /// For syntax trees generated by the parser, this is guaranteed to be `:`. - public var colon: TokenSyntax { - get { - return Syntax(self).child(at: 3)!.cast(TokenSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 3, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnderscorePrivateAttributeArgumentsSyntax.self) - } - } - - public var unexpectedBetweenColonAndFilename: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 4)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 4, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnderscorePrivateAttributeArgumentsSyntax.self) - } - } - - public var filename: StringLiteralExprSyntax { - get { - return Syntax(self).child(at: 5)!.cast(StringLiteralExprSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 5, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnderscorePrivateAttributeArgumentsSyntax.self) - } - } - - public var unexpectedAfterFilename: UnexpectedNodesSyntax? { - get { - return Syntax(self).child(at: 6)?.cast(UnexpectedNodesSyntax.self) - } - set(value) { - self = Syntax(self).replacingChild(at: 6, with: Syntax(value), rawAllocationArena: RawSyntaxArena()).cast(UnderscorePrivateAttributeArgumentsSyntax.self) - } - } - - public static let structure: SyntaxNodeStructure = .layout([ - \Self.unexpectedBeforeSourceFileLabel, - \Self.sourceFileLabel, - \Self.unexpectedBetweenSourceFileLabelAndColon, - \Self.colon, - \Self.unexpectedBetweenColonAndFilename, - \Self.filename, - \Self.unexpectedAfterFilename - ]) -} - // MARK: - UnresolvedAsExprSyntax /// The `as` keyword without any operands. diff --git a/Tests/SwiftParserTest/AttributeTests.swift b/Tests/SwiftParserTest/AttributeTests.swift index 852a420b9e4..6415986681d 100644 --- a/Tests/SwiftParserTest/AttributeTests.swift +++ b/Tests/SwiftParserTest/AttributeTests.swift @@ -18,13 +18,13 @@ final class AttributeTests: ParserTestCase { func testMissingArgumentToAttribute() { assertParse( """ - @_dynamicReplacementℹ️(1️⃣ - func 2️⃣test_dynamic_replacement_for2() { + @_specializeℹ️(1️⃣ + func 2️⃣foo() { } """, diagnostics: [ DiagnosticSpec( - message: "expected argument for '@_dynamicReplacement' attribute", + message: "expected argument for '@_specialize' attribute", fixIts: ["insert attribute argument"] ), DiagnosticSpec( @@ -34,8 +34,8 @@ final class AttributeTests: ParserTestCase { ), ], fixedSource: """ - @_dynamicReplacement(for: <#identifier#>) - func test_dynamic_replacement_for2() { + @_specialize() + func foo() { } """ ) @@ -422,11 +422,7 @@ final class AttributeTests: ParserTestCase { func testSpiAttributeWithoutParameter() { assertParse( - "@_spi(1️⃣) class Foo {}", - diagnostics: [ - DiagnosticSpec(message: "expected argument for '@_spi' attribute", fixIts: ["insert attribute argument"]) - ], - fixedSource: "@_spi(<#identifier#>) class Foo {}" + "@_spi() class Foo {}" ) } @@ -531,22 +527,6 @@ final class AttributeTests: ParserTestCase { @_expose(Cxx, "baz") func foo() {} """ ) - - assertParse( - """ - @_expose(Cxx, 1️⃣baz) func foo() {} - """, - diagnostics: [ - DiagnosticSpec( - locationMarker: "1️⃣", - message: #"expected code 'baz' to be surrounded by '"'"#, - fixIts: [#"insert '"' and '"'"#] - ) - ], - fixedSource: """ - @_expose(Cxx, "baz") func foo() {} - """ - ) } func testOriginallyDefinedIn() { @@ -589,19 +569,9 @@ final class AttributeTests: ParserTestCase { assertParse( """ - @_unavailableFromAsync(1️⃣nope: "abc") + @_unavailableFromAsync(nope: "abc") func foo() {} - """, - diagnostics: [ - DiagnosticSpec( - message: "expected 'message' in @_unavailableFromAsync argument", - fixIts: ["replace 'nope' with 'message'"] - ) - ], - fixedSource: """ - @_unavailableFromAsync(message: "abc") - func foo() {} - """ + """ ) assertParse( @@ -610,30 +580,19 @@ final class AttributeTests: ParserTestCase { func foo() {} """, diagnostics: [ - DiagnosticSpec(message: "expected ':' in @_unavailableFromAsync argument", fixIts: ["replace '=' with ':'"]) + DiagnosticSpec(message: "'=' must have consistent whitespace on both sides", fixIts: ["insert whitespace"]) ], fixedSource: """ - @_unavailableFromAsync(message: "abc") + @_unavailableFromAsync(message = "abc") func foo() {} """ ) assertParse( """ - @_unavailableFromAsync(message: 1️⃣abc) + @_unavailableFromAsync(message: abc) func foo() {} - """, - diagnostics: [ - DiagnosticSpec( - locationMarker: "1️⃣", - message: #"expected code 'abc' to be surrounded by '"'"#, - fixIts: [#"insert '"' and '"'"#] - ) - ], - fixedSource: """ - @_unavailableFromAsync(message: "abc") - func foo() {} - """ + """ ) } @@ -910,19 +869,13 @@ final class AttributeTests: ParserTestCase { """ _ = [@convention(c, cType: "int (*)(int)") (Int32) -> Int32]() """, - substructure: ConventionAttributeArgumentsSyntax( - conventionLabel: .identifier("c"), - comma: .commaToken(), - cTypeLabel: .keyword(.cType), - colon: .colonToken(), - cTypeString: StringLiteralExprSyntax( - openingQuote: .stringQuoteToken(), - segments: StringLiteralSegmentListSyntax([ - StringLiteralSegmentListSyntax.Element(StringSegmentSyntax(content: .stringSegment("int (*)(int)"))) - ]), - closingQuote: .stringQuoteToken() - ) - ) + substructure: LabeledExprListSyntax([ + LabeledExprSyntax( + expression: DeclReferenceExprSyntax(baseName: .identifier("c")), + trailingComma: .commaToken() + ), + LabeledExprSyntax(label: "cType", expression: StringLiteralExprSyntax(content: "int (*)(int)")), + ]) ) } From 78308fc5a6de557f28105e4408d55fded68a8e17 Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Thu, 27 Mar 2025 16:24:49 -0700 Subject: [PATCH 2/2] [Syntax] Add Relase Notes for special attribute list syntax removal --- Release Notes/602.md | 6 ++ .../SwiftSyntaxCompatibility.swift | 60 +++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/Release Notes/602.md b/Release Notes/602.md index ffc24f54a83..791bda7d767 100644 --- a/Release Notes/602.md +++ b/Release Notes/602.md @@ -36,6 +36,12 @@ - Migration steps: Use `SyntaxChildren.endIndex` instead. - Notes: `ExpressibleByNilLiteral` was a mistake. In general, `Collection.Index` should only be created and managed by the collection itself. For example, `Collection.index(after:)` exists, but `Index.advanced(by:)` does not. +- Some cases in `AttributeSyntax.Arguments` choices and related types has been removed + - Description: Some attributes that used to have special attribute list syntax are now parsed as a regular `AttributeSyntax` with `.argumentList(LabeledExprListSyntax)`. + - Pull Request: https://github.com/swiftlang/swift-syntax/pull/3028 + - Migration steps: Use `AttributeSyntax.Arguments.argumentList(LabeledExprListSyntax)` instead. + - Notes: Removed cases from `AttributeSyntax.Arguments`: `token(TokenSyntax)`, `string(StringLiteralExprSyntax)`, `conventionArguments(ConventionAttributeArgumentsSyntax)`, `conventionWitnessMethodArguments(ConventionWitnessMethodAttributeArgumentsSyntax)`, `opaqueReturnTypeOfAttributeArguments(OpaqueReturnTypeOfAttributeArgumentsSyntax)`, `exposeAttributeArguments(ExposeAttributeArgumentsSyntax)`, `underscorePrivateAttributeArguments(UnderscorePrivateAttributeArgumentsSyntax)`, and `unavailableFromAsyncArguments(UnavailableFromAsyncAttributeArgumentsSyntax)`. Removed Syntax kinds: `ConventionAttributeArgumentsSyntax`, `ConventionWitnessMethodAttributeArgumentsSyntax`, `OpaqueReturnTypeOfAttributeArgumentsSyntax`, `ExposeAttributeArgumentsSyntax`, `UnderscorePrivateAttributeArgumentsSyntax`, and `UnavailableFromAsyncAttributeArgumentsSyntax`. +, ## Template - *Affected API or two word description* diff --git a/Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift b/Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift index 343b494295a..a7333a7838d 100644 --- a/Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift +++ b/Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift @@ -112,6 +112,48 @@ extension AttributeSyntax { public typealias Argument = Arguments } +extension AttributeSyntax.Arguments { + @available(*, unavailable, message: "use 'argumentList(LabeledExprListSyntax)' instead") + public static func token(_: TokenSyntax) -> Self { + fatalError("unavailable") + } + + @available(*, unavailable, message: "use 'argumentList(LabeledExprListSyntax)' instead") + public static func string(_: StringLiteralExprSyntax) -> Self { + fatalError("unavailable") + } + + @available(*, unavailable, message: "use 'argumentList(LabeledExprListSyntax)' instead") + public static func conventionArguments(_: ConventionAttributeArgumentsSyntax) -> Self { + fatalError("unavailable") + } + + @available(*, unavailable, message: "use 'argumentList(LabeledExprListSyntax)' instead") + public static func conventionWitnessMethodArguments(_: ConventionWitnessMethodAttributeArgumentsSyntax) -> Self { + fatalError("unavailable") + } + + @available(*, unavailable, message: "use 'argumentList(LabeledExprListSyntax)' instead") + public static func opaqueReturnTypeOfAttributeArguments(_: OpaqueReturnTypeOfAttributeArgumentsSyntax) -> Self { + fatalError("unavailable") + } + + @available(*, unavailable, message: "use 'argumentList(LabeledExprListSyntax)' instead") + public static func exposeAttributeArguments(_: ExposeAttributeArgumentsSyntax) -> Self { + fatalError("unavailable") + } + + @available(*, unavailable, message: "use '.rgumentList(_: LabeledExprListSyntax)' instead") + public static func underscorePrivateAttributeArguments(_: UnderscorePrivateAttributeArgumentsSyntax) -> Self { + fatalError("unavailable") + } + + @available(*, unavailable, message: "use 'argumentList(LabeledExprListSyntax)' instead") + public static func unavailableFromAsyncArguments(_: UnavailableFromAsyncAttributeArgumentsSyntax) -> Self { + fatalError("unavailable") + } +} + @available(*, deprecated, renamed: "WithAttributesSyntax") public typealias AttributedSyntax = WithAttributesSyntax @@ -298,6 +340,12 @@ extension ClosureCaptureSyntax { } } +@available(*, unavailable, message: "Use 'LabeledExprListSyntax' instead") +public struct ConventionAttributeArgumentsSyntax {} + +@available(*, unavailable, message: "Use 'LabeledExprListSyntax' instead") +public struct ConventionWitnessMethodAttributeArgumentsSyntax {} + extension EffectSpecifiersSyntax { @available(*, deprecated, renamed: "unexpectedBetweenAsyncSpecifierAndThrowsClause") public var unexpectedBetweenAsyncSpecifierAndThrowsSpecifier: UnexpectedNodesSyntax? { @@ -330,6 +378,9 @@ extension EffectSpecifiersSyntax { } } +@available(*, unavailable, message: "Use 'LabeledExprListSyntax' instead") +public struct ExposeAttributeArgumentsSyntax {} + extension GenericArgumentSyntax { @_disfavoredOverload @available(*, deprecated, message: "use GenericArgumentSyntax.Argument for 'argument'") @@ -721,6 +772,9 @@ extension MemberAccessExprSyntax { } } +@available(*, unavailable, message: "Use 'LabeledExprListSyntax' instead") +public struct OpaqueReturnTypeOfAttributeArgumentsSyntax {} + extension SyntaxProtocol { @available(*, deprecated, message: "Use detached computed property instead.") public func detach() -> Self { @@ -993,6 +1047,12 @@ extension TypeEffectSpecifiersSyntax { } } +@available(*, unavailable, message: "Use 'LabeledExprListSyntax' instead") +public struct UnderscorePrivateAttributeArgumentsSyntax {} + +@available(*, unavailable, message: "Use 'LabeledExprListSyntax' instead") +public struct UnavailableFromAsyncAttributeArgumentsSyntax {} + extension WildcardPatternSyntax { @available(*, deprecated, message: "remove 'typeAnnotation'") public init(