Skip to content

Commit 14b2dc9

Browse files
committed
Add a recursive hasError flag to RawSyntax
This allows us to check whether a subtree contains a syntax error in O(1). rdar://98575249
1 parent 23d38a1 commit 14b2dc9

File tree

5 files changed

+103
-5
lines changed

5 files changed

+103
-5
lines changed

Sources/SwiftSyntax/RawSyntax.swift

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@
1313
typealias RawSyntaxBuffer = UnsafeBufferPointer<RawSyntax?>
1414
typealias RawTriviaPieceBuffer = UnsafeBufferPointer<RawTriviaPiece>
1515

16+
fileprivate extension SyntaxKind {
17+
/// Whether this node kind should be considered as `hasError` for purposes of `RecursiveRawSyntaxFlags`.
18+
var hasError: Bool {
19+
return self == .unexpectedNodes || self.isMissing
20+
}
21+
}
22+
23+
struct RecursiveRawSyntaxFlags: OptionSet {
24+
let rawValue: UInt8
25+
26+
/// Whether the tree contained by this layout has any missing or unexpected nodes.
27+
static let hasError = RecursiveRawSyntaxFlags(rawValue: 1 << 0)
28+
}
29+
1630
/// Node data for RawSyntax tree. Tagged union plus common data.
1731
internal struct RawSyntaxData {
1832
internal enum Payload {
@@ -36,6 +50,7 @@ internal struct RawSyntaxData {
3650
var byteLength: Int
3751
/// Number of nodes in this subtree, excluding this node.
3852
var descendantCount: Int
53+
var recursiveFlags: RecursiveRawSyntaxFlags
3954
}
4055

4156
fileprivate var payload: Payload
@@ -172,6 +187,13 @@ extension RawSyntax {
172187
kind.isUnknown
173188
}
174189

190+
var hasError: Bool {
191+
switch rawData.payload {
192+
case .materializedToken(_): return self.presence == .missing
193+
case .layout(let dat): return dat.recursiveFlags.contains(.hasError)
194+
}
195+
}
196+
175197
/// Child nodes.
176198
var children: RawSyntaxBuffer {
177199
switch rawData.payload {
@@ -733,12 +755,13 @@ extension RawSyntax {
733755
layout: RawSyntaxBuffer,
734756
byteLength: Int,
735757
descendantCount: Int,
758+
recursiveFlags: RecursiveRawSyntaxFlags,
736759
arena: SyntaxArena
737760
) -> RawSyntax {
738761
validateLayout(layout: layout, as: kind)
739762
let payload = RawSyntaxData.Layout(
740763
kind: kind, layout: layout,
741-
byteLength: byteLength, descendantCount: descendantCount)
764+
byteLength: byteLength, descendantCount: descendantCount, recursiveFlags: recursiveFlags)
742765
return RawSyntax(arena: arena, payload: .layout(payload))
743766
}
744767

@@ -767,18 +790,36 @@ extension RawSyntax {
767790
descendantCount += node.totalNodes
768791
arena.addChild(node.arenaReference)
769792
}
793+
var recursiveFlags = RecursiveRawSyntaxFlags()
794+
if kind.hasError || layoutBuffer.contains(where: { $0?.hasError ?? false }) {
795+
recursiveFlags.insert(.hasError)
796+
}
770797
return .layout(
771-
kind: kind, layout: RawSyntaxBuffer(layoutBuffer),
772-
byteLength: byteLength, descendantCount: descendantCount, arena: arena)
798+
kind: kind,
799+
layout: RawSyntaxBuffer(layoutBuffer),
800+
byteLength: byteLength,
801+
descendantCount: descendantCount,
802+
recursiveFlags: recursiveFlags,
803+
arena: arena
804+
)
773805
}
774806

775807
static func makeEmptyLayout(
776808
kind: SyntaxKind,
777809
arena: SyntaxArena
778810
) -> RawSyntax {
811+
var recursiveFlags = RecursiveRawSyntaxFlags()
812+
if kind.hasError {
813+
recursiveFlags.insert(.hasError)
814+
}
779815
return .layout(
780-
kind: kind, layout: .init(start: nil, count: 0),
781-
byteLength: 0, descendantCount: 0, arena: arena)
816+
kind: kind,
817+
layout: .init(start: nil, count: 0),
818+
byteLength: 0,
819+
descendantCount: 0,
820+
recursiveFlags: recursiveFlags,
821+
arena: arena
822+
)
782823
}
783824

784825
static func makeLayout<C: Collection>(

Sources/SwiftSyntax/Syntax.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,11 @@ public extension SyntaxProtocol {
173173
return raw.kind.isUnknown
174174
}
175175

176+
/// Whether this tree contains a missing token or unexpected node.
177+
var hasError: Bool {
178+
return raw.hasError
179+
}
180+
176181
/// The parent of this syntax node, or `nil` if this node is the root.
177182
var parent: Syntax? {
178183
return data.parent

Sources/SwiftSyntax/SyntaxKind.swift.gyb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,18 @@ internal enum SyntaxKind: CSyntaxKind {
4949
default: return false
5050
}
5151
}
52+
53+
var isMissing: Bool {
54+
switch self {
55+
% for name in SYNTAX_BASE_KINDS:
56+
% if name not in ["Syntax", "SyntaxCollection"]:
57+
case .missing${name}: return true
58+
% end
59+
% end
60+
case .missing: return true
61+
default: return false
62+
}
63+
}
5264
}
5365

5466
extension SyntaxKind {

Sources/SwiftSyntax/gyb_generated/SyntaxKind.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,18 @@ internal enum SyntaxKind: CSyntaxKind {
339339
default: return false
340340
}
341341
}
342+
343+
var isMissing: Bool {
344+
switch self {
345+
case .missingDecl: return true
346+
case .missingExpr: return true
347+
case .missingPattern: return true
348+
case .missingStmt: return true
349+
case .missingType: return true
350+
case .missing: return true
351+
default: return false
352+
}
353+
}
342354
}
343355

344356
extension SyntaxKind {
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
//===--- SyntaxTests.swift ------------------------------------------------===//
2+
//
3+
// This source file is part of the Swift.org open source project
4+
//
5+
// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
7+
//
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
10+
//
11+
//===----------------------------------------------------------------------===//
12+
13+
import XCTest
14+
import SwiftSyntax
15+
16+
public class SyntaxTests: XCTestCase {
17+
18+
public func testHasError() {
19+
XCTAssertTrue(TokenSyntax.funcKeyword(presence: .missing).hasError)
20+
XCTAssertFalse(TokenSyntax.funcKeyword(presence: .present).hasError)
21+
XCTAssertTrue(UnexpectedNodesSyntax([]).hasError)
22+
XCTAssertTrue(MissingExprSyntax().hasError)
23+
XCTAssertFalse(CodeBlockItemListSyntax([]).hasError)
24+
25+
XCTAssertTrue(TokenListSyntax([TokenSyntax.funcKeyword(presence: .missing)]).hasError)
26+
XCTAssertFalse(TokenListSyntax([TokenSyntax.funcKeyword(presence: .present)]).hasError)
27+
}
28+
}

0 commit comments

Comments
 (0)