Skip to content

Add a recursive hasError flag to RawSyntax #596

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 1 commit into from
Aug 18, 2022
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
58 changes: 53 additions & 5 deletions Sources/SwiftSyntax/RawSyntax.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@
typealias RawSyntaxBuffer = UnsafeBufferPointer<RawSyntax?>
typealias RawTriviaPieceBuffer = UnsafeBufferPointer<RawTriviaPiece>

fileprivate extension SyntaxKind {
/// Whether this node kind should be considered as `hasError` for purposes of `RecursiveRawSyntaxFlags`.
var hasError: Bool {
return self == .unexpectedNodes || self.isMissing
}
}

struct RecursiveRawSyntaxFlags: OptionSet {
let rawValue: UInt8

/// Whether the tree contained by this layout has any missing or unexpected nodes.
static let hasError = RecursiveRawSyntaxFlags(rawValue: 1 << 0)
}

/// Node data for RawSyntax tree. Tagged union plus common data.
internal struct RawSyntaxData {
internal enum Payload {
Expand Down Expand Up @@ -54,6 +68,7 @@ internal struct RawSyntaxData {
var byteLength: Int
/// Number of nodes in this subtree, excluding this node.
var descendantCount: Int
var recursiveFlags: RecursiveRawSyntaxFlags
}

fileprivate var payload: Payload
Expand Down Expand Up @@ -215,6 +230,19 @@ extension RawSyntax {
kind.isUnknown
}

var recursiveFlags: RecursiveRawSyntaxFlags {
switch rawData.payload {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since I merged ParsedToken PR, this switch needs to handle it. Sorry 🙇

case .materializedToken, .parsedToken:
var recursiveFlags: RecursiveRawSyntaxFlags = []
if presence == .missing {
recursiveFlags.insert(.hasError)
}
return recursiveFlags
case .layout(let dat):
return dat.recursiveFlags
}
}

/// Child nodes.
var children: RawSyntaxBuffer {
switch rawData.payload {
Expand Down Expand Up @@ -815,12 +843,13 @@ extension RawSyntax {
layout: RawSyntaxBuffer,
byteLength: Int,
descendantCount: Int,
recursiveFlags: RecursiveRawSyntaxFlags,
arena: SyntaxArena
) -> RawSyntax {
validateLayout(layout: layout, as: kind)
let payload = RawSyntaxData.Layout(
kind: kind, layout: layout,
byteLength: byteLength, descendantCount: descendantCount)
byteLength: byteLength, descendantCount: descendantCount, recursiveFlags: recursiveFlags)
return RawSyntax(arena: arena, payload: .layout(payload))
}

Expand All @@ -844,23 +873,42 @@ extension RawSyntax {
// Calculate the "byte width".
var byteLength = 0
var descendantCount = 0
var recursiveFlags = RecursiveRawSyntaxFlags()
if kind.hasError {
recursiveFlags.insert(.hasError)
}
for case let node? in layoutBuffer {
byteLength += node.byteLength
descendantCount += node.totalNodes
recursiveFlags.insert(node.recursiveFlags)
arena.addChild(node.arenaReference)
}
return .layout(
kind: kind, layout: RawSyntaxBuffer(layoutBuffer),
byteLength: byteLength, descendantCount: descendantCount, arena: arena)
kind: kind,
layout: RawSyntaxBuffer(layoutBuffer),
byteLength: byteLength,
descendantCount: descendantCount,
recursiveFlags: recursiveFlags,
arena: arena
)
}

static func makeEmptyLayout(
kind: SyntaxKind,
arena: SyntaxArena
) -> RawSyntax {
var recursiveFlags = RecursiveRawSyntaxFlags()
if kind.hasError {
recursiveFlags.insert(.hasError)
}
return .layout(
kind: kind, layout: .init(start: nil, count: 0),
byteLength: 0, descendantCount: 0, arena: arena)
kind: kind,
layout: .init(start: nil, count: 0),
byteLength: 0,
descendantCount: 0,
recursiveFlags: recursiveFlags,
arena: arena
)
}

static func makeLayout<C: Collection>(
Expand Down
5 changes: 5 additions & 0 deletions Sources/SwiftSyntax/Syntax.swift
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@ public extension SyntaxProtocol {
return raw.kind.isUnknown
}

/// Whether this tree contains a missing token or unexpected node.
var hasError: Bool {
return raw.recursiveFlags.contains(.hasError)
}

/// The parent of this syntax node, or `nil` if this node is the root.
var parent: Syntax? {
return data.parent
Expand Down
12 changes: 12 additions & 0 deletions Sources/SwiftSyntax/SyntaxKind.swift.gyb
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,18 @@ internal enum SyntaxKind: CSyntaxKind {
default: return false
}
}

var isMissing: Bool {
switch self {
% for name in SYNTAX_BASE_KINDS:
% if name not in ["Syntax", "SyntaxCollection"]:
case .missing${name}: return true
% end
% end
case .missing: return true
default: return false
}
}
}

extension SyntaxKind {
Expand Down
12 changes: 12 additions & 0 deletions Sources/SwiftSyntax/gyb_generated/SyntaxKind.swift
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,18 @@ internal enum SyntaxKind: CSyntaxKind {
default: return false
}
}

var isMissing: Bool {
switch self {
case .missingDecl: return true
case .missingExpr: return true
case .missingPattern: return true
case .missingStmt: return true
case .missingType: return true
case .missing: return true
default: return false
}
}
}

extension SyntaxKind {
Expand Down
28 changes: 28 additions & 0 deletions Tests/SwiftSyntaxTest/SyntaxTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//===--- SyntaxTests.swift ------------------------------------------------===//
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
//
//===----------------------------------------------------------------------===//

import XCTest
import SwiftSyntax

public class SyntaxTests: XCTestCase {

public func testHasError() {
XCTAssertTrue(TokenSyntax.funcKeyword(presence: .missing).hasError)
XCTAssertFalse(TokenSyntax.funcKeyword(presence: .present).hasError)
XCTAssertTrue(UnexpectedNodesSyntax([]).hasError)
XCTAssertTrue(MissingExprSyntax().hasError)
XCTAssertFalse(CodeBlockItemListSyntax([]).hasError)

XCTAssertTrue(TokenListSyntax([TokenSyntax.funcKeyword(presence: .missing)]).hasError)
XCTAssertFalse(TokenListSyntax([TokenSyntax.funcKeyword(presence: .present)]).hasError)
}
}