Skip to content
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/CommonNodes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ public let COMMON_NODES: [Node] = [
Node(
kind: .moduleSelector,
base: .syntax,
experimentalFeature: .moduleSelector,
nameForDiagnostics: "module selector",
children: [
Child(
Expand Down
6 changes: 4 additions & 2 deletions CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1559,7 +1559,6 @@ public let DECL_NODES: [Node] = [
Child(
name: "moduleSelector",
kind: .node(kind: .moduleSelector),
experimentalFeature: .moduleSelector,
isOptional: true
),
Child(
Expand Down Expand Up @@ -1600,12 +1599,15 @@ public let DECL_NODES: [Node] = [
),
],
childHistory: [
[
"moduleSelector": .introduced
],
[
"pound": .renamed(from: "poundToken"),
"macroName": .renamed(from: "macro"),
"genericArgumentClause": .renamed(from: "genericArguments"),
"arguments": .renamed(from: "argumentList"),
]
],
]
),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public enum ExperimentalFeature: String, CaseIterable {
case keypathWithMethodMembers
case oldOwnershipOperatorSpellings
case defaultIsolationPerFile
case moduleSelector
case borrowAndMutateAccessors

/// The name of the feature as it is written in the compiler's `Features.def` file.
Expand All @@ -46,8 +45,6 @@ public enum ExperimentalFeature: String, CaseIterable {
return "OldOwnershipOperatorSpellings"
case .defaultIsolationPerFile:
return "DefaultIsolationPerFile"
case .moduleSelector:
return "ModuleSelector"
case .borrowAndMutateAccessors:
return "BorrowAndMutateAccessors"
}
Expand All @@ -74,8 +71,6 @@ public enum ExperimentalFeature: String, CaseIterable {
return "`_move` and `_borrow` as ownership operators"
case .defaultIsolationPerFile:
return "set default actor isolation for a file"
case .moduleSelector:
return "Module selector syntax (`ModName::identifier`)"
case .borrowAndMutateAccessors:
return "borrow and mutate accessors"
}
Expand Down
12 changes: 8 additions & 4 deletions CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,6 @@ public let EXPR_NODES: [Node] = [
Child(
name: "moduleSelector",
kind: .node(kind: .moduleSelector),
experimentalFeature: .moduleSelector,
isOptional: true
),
Child(
Expand All @@ -1029,10 +1028,13 @@ public let EXPR_NODES: [Node] = [
),
],
childHistory: [
[
"moduleSelector": .introduced
],
[
"baseName": .renamed(from: "identifier"),
"argumentNames": .renamed(from: "declNameArguments"),
]
],
]
),

Expand Down Expand Up @@ -1367,7 +1369,6 @@ public let EXPR_NODES: [Node] = [
Child(
name: "moduleSelector",
kind: .node(kind: .moduleSelector),
experimentalFeature: .moduleSelector,
isOptional: true
),
Child(
Expand Down Expand Up @@ -1408,12 +1409,15 @@ public let EXPR_NODES: [Node] = [
),
],
childHistory: [
[
"moduleSelector": .introduced
],
[
"pound": .renamed(from: "poundToken"),
"macroName": .renamed(from: "macro"),
"genericArgumentClause": .renamed(from: "genericArguments"),
"arguments": .renamed(from: "argumentList"),
]
],
]
),

Expand Down
6 changes: 4 additions & 2 deletions CodeGeneration/Sources/SyntaxSupport/Traits.swift
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ public let TRAITS: [Trait] = [
Child(
name: "moduleSelector",
kind: .node(kind: .moduleSelector),
experimentalFeature: .moduleSelector,
isOptional: true
),
Child(name: "macroName", kind: .token(choices: [.token(.identifier)])),
Expand All @@ -107,12 +106,15 @@ public let TRAITS: [Trait] = [
Child(name: "additionalTrailingClosures", kind: .node(kind: .multipleTrailingClosureElementList)),
],
childHistory: [
[
"moduleSelector": .introduced
],
[
"pound": .renamed(from: "poundToken"),
"macroName": .renamed(from: "macro"),
"arguments": .renamed(from: "argumentList"),
"genericArgumentClause": .renamed(from: "genericArguments"),
]
],
]
),
Trait(
Expand Down
12 changes: 10 additions & 2 deletions CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ public let TYPE_NODES: [Node] = [
Child(
name: "moduleSelector",
kind: .node(kind: .moduleSelector),
experimentalFeature: .moduleSelector,
nameForDiagnostics: "module selector",
isOptional: true
),
Expand All @@ -382,6 +381,11 @@ public let TYPE_NODES: [Node] = [
kind: .node(kind: .genericArgumentClause),
isOptional: true
),
],
childHistory: [
[
"moduleSelector": .introduced
]
]
),

Expand Down Expand Up @@ -521,7 +525,6 @@ public let TYPE_NODES: [Node] = [
Child(
name: "moduleSelector",
kind: .node(kind: .moduleSelector),
experimentalFeature: .moduleSelector,
nameForDiagnostics: "module selector",
isOptional: true
),
Expand All @@ -539,6 +542,11 @@ public let TYPE_NODES: [Node] = [
kind: .node(kind: .genericArgumentClause),
isOptional: true
),
],
childHistory: [
[
"moduleSelector": .introduced
]
]
),

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParser/Lexer/Cursor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ extension Lexer.Cursor {

private mutating func lexNormalColon() -> Lexer.Result {
_ = self.advance()
guard self.experimentalFeatures.contains(.moduleSelector) && self.peek() == ":" else {
guard self.peek() == ":" else {
return Lexer.Result(.colon)
}

Expand Down
7 changes: 1 addition & 6 deletions Sources/SwiftParser/generated/ExperimentalFeatures.swift

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

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

2 changes: 0 additions & 2 deletions Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

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

1 change: 0 additions & 1 deletion Sources/SwiftSyntax/generated/SyntaxEnum.swift

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

1 change: 0 additions & 1 deletion Sources/SwiftSyntax/generated/SyntaxKind.swift

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

3 changes: 1 addition & 2 deletions Sources/SwiftSyntax/generated/SyntaxRewriter.swift

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

1 change: 0 additions & 1 deletion Sources/SwiftSyntax/generated/SyntaxTraits.swift

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

6 changes: 2 additions & 4 deletions Sources/SwiftSyntax/generated/SyntaxVisitor.swift

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

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

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

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

Loading