Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Parser] Always enable abiAttribute feature #3026

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Parser] Always enable abiAttribute feature #3026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,17 @@ public enum ExperimentalFeature: String, CaseIterable {
}
}

public var isAlwaysEnabledInParser: Bool {
switch self {
case .abiAttribute:
// `@abi` attributes should be always parsed because not parsing its interior
// breaks the tree catastrophically.
return true
default:
return false
}
}

/// The token that represents the experimental feature case name.
public var token: TokenSyntax {
.identifier(rawValue)
Expand Down
13 changes: 13 additions & 0 deletions ...ration/Sources/generate-swift-syntax/templates/swiftparser/ExperimentalFeaturesFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@ let experimentalFeaturesFile = SourceFileSyntax(leadingTrivia: copyrightHeader)
)
}

try! VariableDeclSyntax(
"""
/// Set of features always enabled.
static var alwaysEnabledFeatures: Self
"""
) {
ArrayExprSyntax {
for feature in ExperimentalFeature.allCases where feature.isAlwaysEnabledInParser {
ArrayElementSyntax(expression: ExprSyntax(".\(feature.token)"))
}
}
}

try! InitializerDeclSyntax(
"""
/// Creates a new value representing the experimental feature with the
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParser/Parser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public struct Parser {

self.maximumNestingLevel = maximumNestingLevel ?? Self.defaultMaximumNestingLevel
self.swiftVersion = swiftVersion ?? Self.defaultSwiftVersion
self.experimentalFeatures = experimentalFeatures
self.experimentalFeatures = experimentalFeatures.union(.alwaysEnabledFeatures)
self.lookaheadTrackerOwner = LookaheadTrackerOwner()

self.lexemes = Lexer.tokenize(input, lookaheadTracker: lookaheadTrackerOwner.lookaheadTracker)
Expand Down
5 changes: 5 additions & 0 deletions Sources/SwiftParser/generated/ExperimentalFeatures.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 27 additions & 54 deletions Tests/SwiftParserTest/AttributeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,74 +960,64 @@ final class AttributeTests: ParserTestCase {
parameterClause: FunctionParameterClauseSyntax {},
returnClause: ReturnClauseSyntax(type: TypeSyntax("Int"))
)
) {},
experimentalFeatures: [.abiAttribute]
) {}
)

assertParse(
"""
@abi(associatedtype AssocTy)
associatedtype AssocTy
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(deinit)
deinit {}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
enum EnumCaseDeclNotParsedAtTopLevel {
@abi(case someCase)
case someCase
}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(func fn())
func fn()
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(init())
init() {}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(subscript(i: Int) -> Element)
subscript(i: Int) -> Element {}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(typealias Typealias = @escaping () -> Void)
typealias Typealias = () -> Void
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(let c1, c2)
let c1, c2
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(var v1, v2)
var v1, v2
""",
experimentalFeatures: [.abiAttribute]
"""
)

assertParse(
Expand All @@ -1042,8 +1032,7 @@ final class AttributeTests: ParserTestCase {
),
diagnostics: [
DiagnosticSpec(locationMarker: "1️⃣", message: "editor placeholder in source file")
],
experimentalFeatures: [.abiAttribute]
]
)

assertParse(
Expand All @@ -1067,8 +1056,7 @@ final class AttributeTests: ParserTestCase {
),
diagnostics: [
DiagnosticSpec(locationMarker: "1️⃣", message: "import is not permitted as ABI-providing declaration")
],
experimentalFeatures: [.abiAttribute]
]
)

//
Expand All @@ -1079,66 +1067,57 @@ final class AttributeTests: ParserTestCase {
"""
@abi(associatedtype AssocTy = T)
associatedtype AssocTy
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(deinit {})
deinit {}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
enum EnumCaseDeclNotParsedAtTopLevel {
@abi(case someCase = 42)
case someCase
}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(func fn() {})
func fn()
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(init() {})
init() {}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(subscript(i: Int) -> Element { get {} set {} })
subscript(i: Int) -> Element {}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(let c1 = 1, c2 = 2)
let c1, c2
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(var v1 = 1, v2 = 2)
var v1, v2
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
@abi(var v3 { get {} set {} })
var v3
""",
experimentalFeatures: [.abiAttribute]
"""
)

//
Expand All @@ -1160,8 +1139,7 @@ final class AttributeTests: ParserTestCase {
fixedSource: """
@abi(var <#pattern#>)
var v1
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
Expand All @@ -1184,8 +1162,7 @@ final class AttributeTests: ParserTestCase {
fixedSource: """
@abi(var v2)
var v2
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
Expand All @@ -1203,8 +1180,7 @@ final class AttributeTests: ParserTestCase {
fixedSource: """
@abi(<#declaration#>)
func fn2() {}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
Expand All @@ -1221,8 +1197,7 @@ final class AttributeTests: ParserTestCase {
fixedSource: """
@abi(<#declaration#>)
func fn3() {}
""",
experimentalFeatures: [.abiAttribute]
"""
)
assertParse(
"""
Expand All @@ -1244,8 +1219,7 @@ final class AttributeTests: ParserTestCase {
fixedSource: """
@abi(<#declaration#>) func fn4_abi())
func fn4() {}
""",
experimentalFeatures: [.abiAttribute]
"""
)

// `#if` is banned inside an `@abi` attribute.
Expand Down Expand Up @@ -1278,8 +1252,7 @@ final class AttributeTests: ParserTestCase {
func _fn<E: Error>() throws(E)
)
func fn<E: Error>() throws(E) {}
""",
experimentalFeatures: [.abiAttribute]
"""
)
}

Expand Down