Skip to content

Commit f3cb538

Browse files
CodaFiRobert Widmann
authored andcommitted
Replace Unknown with Missing
1 parent 0583311 commit f3cb538

27 files changed

+29
-216
lines changed

Sources/SwiftSyntax/Documentation.docc/SwiftSyntax.md.gyb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
133133
- <doc:SwiftSyntax/${node.name}>
134134
% end
135135
% end
136-
- <doc:SwiftSyntax/UnknownSyntax>
137136

138137
### Traits
139138

Sources/SwiftSyntax/Documentation.docc/gyb_generated/SwiftSyntax.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
417417
- <doc:SwiftSyntax/MissingStmtSyntax>
418418
- <doc:SwiftSyntax/MissingTypeSyntax>
419419
- <doc:SwiftSyntax/MissingPatternSyntax>
420-
- <doc:SwiftSyntax/UnknownSyntax>
421420

422421
### Traits
423422

Sources/SwiftSyntax/Misc.swift.gyb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
extension Syntax {
2323
public static var structure: SyntaxNodeStructure {
2424
return .choices([
25-
.node(UnknownSyntax.self),
2625
.node(TokenSyntax.self),
2726
% for node in NON_BASE_SYNTAX_NODES:
2827
% if node.is_base():
@@ -39,7 +38,6 @@ extension SyntaxKind {
3938
public var syntaxNodeType: SyntaxProtocol.Type {
4039
switch self {
4140
case .token: return TokenSyntax.self
42-
case .unknown: return UnknownSyntax.self
4341
% for node in NON_BASE_SYNTAX_NODES:
4442
case .${node.swift_syntax_kind}: return ${node.name}.self
4543
% end
@@ -48,8 +46,6 @@ extension SyntaxKind {
4846

4947
public var nameForDiagnostics: String? {
5048
switch self {
51-
case .unknown:
52-
return nil
5349
case .token:
5450
return "token"
5551
% for node in NON_BASE_SYNTAX_NODES:

Sources/SwiftSyntax/Raw/RawSyntaxValidation.swift.gyb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
9191
}
9292

9393
switch kind {
94-
case .unknown:
95-
break
9694
case .token:
9795
assertionFailure("validateLayout for .token kind is not supported")
9896
% for node in NON_BASE_SYNTAX_NODES:

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxValidation.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
8585
}
8686

8787
switch kind {
88-
case .unknown:
89-
break
9088
case .token:
9189
assertionFailure("validateLayout for .token kind is not supported")
9290
case .missing:

Sources/SwiftSyntax/SyntaxAnyVisitor.swift.gyb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
5858
visitAnyPost(node._syntaxNode)
5959
}
6060

61-
override open func visit(_ node: UnknownSyntax) -> SyntaxVisitorContinueKind {
62-
return visitAny(node._syntaxNode)
63-
}
64-
65-
override open func visitPost(_ node: UnknownSyntax) {
66-
visitAnyPost(node._syntaxNode)
67-
}
68-
6961
% for node in SYNTAX_NODES:
7062
% if is_visitable(node):
7163
override open func visit(_ node: ${node.name}) -> SyntaxVisitorContinueKind {

Sources/SwiftSyntax/SyntaxEnum.swift.gyb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
/// Enum to exhaustively switch over all different syntax nodes.
2323
@frozen // FIXME: Not actually stable, works around a miscompile
2424
public enum SyntaxEnum {
25-
case unknown(UnknownSyntax)
2625
case token(TokenSyntax)
2726
% for node in NON_BASE_SYNTAX_NODES:
2827
% if node.is_base():
@@ -39,8 +38,6 @@ public extension Syntax {
3938
switch raw.kind {
4039
case .token:
4140
return .token(TokenSyntax(self)!)
42-
case .unknown:
43-
return .unknown(UnknownSyntax(self)!)
4441
% for node in NON_BASE_SYNTAX_NODES:
4542
case .${node.swift_syntax_kind}:
4643
% if node.is_base():

Sources/SwiftSyntax/SyntaxFactory.swift.gyb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ public enum SyntaxFactory {
3939
presence: presence)
4040
}
4141

42-
@available(*, deprecated, message: "Use initializer on UnknownSyntax")
43-
public static func makeUnknownSyntax(tokens: [TokenSyntax]) -> UnknownSyntax {
44-
UnknownSyntax(tokens: tokens)
45-
}
46-
4742
/// MARK: Syntax Node Creation APIs
4843

4944
% for node in SYNTAX_NODES:

Sources/SwiftSyntax/SyntaxKind.swift.gyb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
@frozen // FIXME: Not actually stable, works around a miscompile
2323
public enum SyntaxKind {
2424
case token
25-
case unknown
2625
% for node in NON_BASE_SYNTAX_NODES:
2726
case ${node.swift_syntax_kind}
2827
% end
@@ -34,7 +33,6 @@ public enum SyntaxKind {
3433
case .${node.swift_syntax_kind}: return true
3534
% end
3635
% end
37-
case .unknown: return true
3836
default: return false
3937
}
4038
}

Sources/SwiftSyntax/SyntaxOtherNodes.swift

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,6 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
// MARK: UnknownSyntax
14-
15-
/// A wrapper around a raw Syntax layout.
16-
public struct UnknownSyntax: SyntaxProtocol, SyntaxHashable {
17-
public let _syntaxNode: Syntax
18-
19-
public init?<S: SyntaxProtocol>(_ node: S) {
20-
guard node.raw.kind == .unknown else { return nil }
21-
self._syntaxNode = node._syntaxNode
22-
}
23-
24-
/// Creates an `UnknownSyntax` node from the given `SyntaxData`. This assumes
25-
/// that the `SyntaxData` is of the correct kind. If it is not, the behaviour
26-
/// is undefined.
27-
internal init(_ data: SyntaxData) {
28-
assert(data.raw.kind == .unknown)
29-
self._syntaxNode = Syntax(data)
30-
}
31-
32-
public init(tokens: [TokenSyntax]) {
33-
let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in
34-
let raw = RawSyntax.makeLayout(kind: .unknown,
35-
from: tokens.map { $0.raw }, arena: arena)
36-
return SyntaxData.forRoot(raw)
37-
}
38-
self.init(data)
39-
}
40-
41-
public static var structure: SyntaxNodeStructure {
42-
return .layout([])
43-
}
44-
45-
public func childNameForDiagnostics(_ index: SyntaxChildrenIndex) -> String? {
46-
return nil
47-
}
48-
}
49-
50-
extension UnknownSyntax: CustomReflectable {
51-
public var customMirror: Mirror {
52-
return Mirror(self, children: [:])
53-
}
54-
}
55-
5613
// MARK: TokenSyntax
5714

5815
/// A Syntax node representing a single token.

0 commit comments

Comments
 (0)