Skip to content

[SE-0458] Enable unsafe expressions and for..in effects everywhere #2978

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.

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

Merged
merged 4 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ public let EXPR_NODES: [Node] = [
Node(
kind: .unsafeExpr,
base: .expr,
experimentalFeature: .unsafeExpression,
nameForDiagnostics: "'unsafe' expression",
children: [
Child(
Expand Down
1 change: 0 additions & 1 deletion CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ public let STMT_NODES: [Node] = [
Child(
name: "unsafeKeyword",
kind: .token(choices: [.keyword(.unsafe)]),
experimentalFeature: .unsafeExpression,
isOptional: true
),
Child(
Expand Down
4 changes: 4 additions & 0 deletions Sources/SwiftParser/Expressions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,10 @@ extension Parser {
)
)
case (.unsafe, let handle)?:
if self.peek().isAtStartOfLine || self.peek(isAt: .rightParen) {
break EXPR_PREFIX
}

let unsafeTok = self.eat(handle)
let sub = self.parseSequenceExpressionElement(
flavor: flavor,
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParser/TokenSpecSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ enum ExpressionModifierKeyword: TokenSpecSet {
case TokenSpec(.repeat): self = .repeat
case TokenSpec(.each): self = .each
case TokenSpec(.any): self = .any
case TokenSpec(.unsafe) where experimentalFeatures.contains(.unsafeExpression): self = .unsafe
case TokenSpec(.unsafe): self = .unsafe
default: return nil
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
- <doc:SwiftSyntax/UnresolvedAsExprSyntax>
- <doc:SwiftSyntax/UnresolvedIsExprSyntax>
- <doc:SwiftSyntax/UnresolvedTernaryExprSyntax>
- <doc:SwiftSyntax/UnsafeExprSyntax>

### Patterns

Expand Down
2 changes: 0 additions & 2 deletions Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2294,12 +2294,10 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
visitAnyPost(node._syntaxNode)
}

@_spi(ExperimentalLanguageFeatures)
override open func visit(_ node: UnsafeExprSyntax) -> SyntaxVisitorContinueKind {
return visitAny(node._syntaxNode)
}

@_spi(ExperimentalLanguageFeatures)
override open func visitPost(_ node: UnsafeExprSyntax) {
visitAnyPost(node._syntaxNode)
}
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ extension Syntax {
/// - ``UnresolvedAsExprSyntax``
/// - ``UnresolvedIsExprSyntax``
/// - ``UnresolvedTernaryExprSyntax``
/// - ``UnsafeExprSyntax``
public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
public let _syntaxNode: Syntax

Expand Down
2 changes: 0 additions & 2 deletions Sources/SwiftSyntax/generated/SyntaxEnum.swift
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ public enum SyntaxEnum: Sendable {
case unresolvedAsExpr(UnresolvedAsExprSyntax)
case unresolvedIsExpr(UnresolvedIsExprSyntax)
case unresolvedTernaryExpr(UnresolvedTernaryExprSyntax)
@_spi(ExperimentalLanguageFeatures)
case unsafeExpr(UnsafeExprSyntax)
case valueBindingPattern(ValueBindingPatternSyntax)
case variableDecl(VariableDeclSyntax)
Expand Down Expand Up @@ -1051,7 +1050,6 @@ public enum ExprSyntaxEnum {
case unresolvedAsExpr(UnresolvedAsExprSyntax)
case unresolvedIsExpr(UnresolvedIsExprSyntax)
case unresolvedTernaryExpr(UnresolvedTernaryExprSyntax)
@_spi(ExperimentalLanguageFeatures)
case unsafeExpr(UnsafeExprSyntax)
}

Expand Down
1 change: 0 additions & 1 deletion Sources/SwiftSyntax/generated/SyntaxKind.swift
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ public enum SyntaxKind: Sendable {
case unresolvedAsExpr
case unresolvedIsExpr
case unresolvedTernaryExpr
@_spi(ExperimentalLanguageFeatures)
case unsafeExpr
case valueBindingPattern
case variableDecl
Expand Down
3 changes: 1 addition & 2 deletions Sources/SwiftSyntax/generated/SyntaxRewriter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2048,10 +2048,9 @@ open class SyntaxRewriter {
return ExprSyntax(UnresolvedTernaryExprSyntax(unsafeCasting: visitChildren(node._syntaxNode)))
}

/// Visit a `UnsafeExprSyntax`.
/// Visit a ``UnsafeExprSyntax``.
/// - Parameter node: the node that is being visited
/// - Returns: the rewritten node
@_spi(ExperimentalLanguageFeatures)
open func visit(_ node: UnsafeExprSyntax) -> ExprSyntax {
return ExprSyntax(UnsafeExprSyntax(unsafeCasting: visitChildren(node._syntaxNode)))
}
Expand Down
6 changes: 2 additions & 4 deletions Sources/SwiftSyntax/generated/SyntaxVisitor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3380,17 +3380,15 @@ open class SyntaxVisitor {
open func visitPost(_ node: UnresolvedTernaryExprSyntax) {
}

/// Visiting `UnsafeExprSyntax` specifically.
/// Visiting ``UnsafeExprSyntax`` specifically.
/// - Parameter node: the node we are visiting.
/// - Returns: how should we continue visiting.
@_spi(ExperimentalLanguageFeatures)
open func visit(_ node: UnsafeExprSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

/// The function called after visiting `UnsafeExprSyntax` and its descendants.
/// The function called after visiting ``UnsafeExprSyntax`` and its descendants.
/// - node: the node we just finished visiting.
@_spi(ExperimentalLanguageFeatures)
open func visitPost(_ node: UnsafeExprSyntax) {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1951,7 +1951,6 @@ public struct RawUnresolvedTernaryExprSyntax: RawExprSyntaxNodeProtocol {
}
}

@_spi(ExperimentalLanguageFeatures)
@_spi(RawSyntax)
public struct RawUnsafeExprSyntax: RawExprSyntaxNodeProtocol {
@_spi(RawSyntax)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2841,7 +2841,6 @@ public struct ForStmtSyntax: StmtSyntaxProtocol, SyntaxHashable, _LeafStmtSyntax
}
}

@_spi(ExperimentalLanguageFeatures)
public var unexpectedBetweenAwaitKeywordAndUnsafeKeyword: UnexpectedNodesSyntax? {
get {
return Syntax(self).child(at: 6)?.cast(UnexpectedNodesSyntax.self)
Expand All @@ -2854,7 +2853,6 @@ public struct ForStmtSyntax: StmtSyntaxProtocol, SyntaxHashable, _LeafStmtSyntax
/// ### Tokens
///
/// For syntax trees generated by the parser, this is guaranteed to be `unsafe`.
@_spi(ExperimentalLanguageFeatures)
public var unsafeKeyword: TokenSyntax? {
get {
return Syntax(self).child(at: 7)?.cast(TokenSyntax.self)
Expand All @@ -2864,7 +2862,6 @@ public struct ForStmtSyntax: StmtSyntaxProtocol, SyntaxHashable, _LeafStmtSyntax
}
}

@_spi(ExperimentalLanguageFeatures)
public var unexpectedBetweenUnsafeKeywordAndCaseKeyword: UnexpectedNodesSyntax? {
get {
return Syntax(self).child(at: 8)?.cast(UnexpectedNodesSyntax.self)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3272,13 +3272,10 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable, _

// MARK: - UnsafeExprSyntax

/// - Note: Requires experimental feature `unsafeExpression`.
///
/// ### Children
///
/// - `unsafeKeyword`: `unsafe`
/// - `expression`: ``ExprSyntax``
@_spi(ExperimentalLanguageFeatures)
public struct UnsafeExprSyntax: ExprSyntaxProtocol, SyntaxHashable, _LeafExprSyntaxNodeProtocol {
public let _syntaxNode: Syntax

Expand Down
22 changes: 4 additions & 18 deletions Tests/SwiftParserTest/ExpressionTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2194,31 +2194,17 @@ final class StatementExpressionTests: ParserTestCase {
func f() {
let x = unsafe y
}
""",
experimentalFeatures: .unsafeExpression
"""
)

assertParse(
"""
func f() {
let x = unsafe1️⃣ y
let x = unsafe
y
}
""",
diagnostics: [
DiagnosticSpec(
message: "consecutive statements on a line must be separated by newline or ';'",
fixIts: [
"insert newline",
"insert ';'",
]
)
],
fixedSource: """
func f() {
let x = unsafe
y
}
"""
substructure: DeclReferenceExprSyntax(baseName: .identifier("unsafe"))
)
}

Expand Down
12 changes: 4 additions & 8 deletions Tests/SwiftParserTest/StatementTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -960,23 +960,19 @@ final class StatementTests: ParserTestCase {

func testForUnsafeStatement() {
assertParse(
"for try await unsafe x in e { }",
experimentalFeatures: [.unsafeExpression]
"for try await unsafe x in e { }"
)

assertParse(
"for try await unsafe in e { }",
experimentalFeatures: [.unsafeExpression]
"for try await unsafe in e { }"
)

assertParse(
"for unsafe in e { }",
experimentalFeatures: [.unsafeExpression]
"for unsafe in e { }"
)

assertParse(
"for unsafe: Int in e { }",
experimentalFeatures: [.unsafeExpression]
"for unsafe: Int in e { }"
)
}
}