averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[libSyntax] Remove getData method from ParsedRawSyntaxNode

Browse Source 
The getData and getRecordedOrDeferredNode methods broke the move-only semantics of ParsedRawSyntaxNode because it allowed retrieving the data without resetting it.

Change most uses to use takeData or takeRecordedOrDeferredNode instead of the get methods.

To retrieve the children of a ParsedRawSyntaxNode, we still need a way to access the OpaqueSyntaxNode for inspection by the SyntaxParseActions without resetting it. For this, we still maintain a method with the semantics of getData, but it’s now called getUnsafeOpaqueData to make sure it’s not accidentally used.
This commit is contained in:
Alex Hoppen
2021-03-09 12:09:14 +01:00
parent a38dc1aa60
commit e6da01b912
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Parse/ParsedRawSyntaxRecorder.cpp
View File

@@ -28,19 +28,19 @@ using namespace swift;
using namespace swift::syntax;
ParsedRawSyntaxNode
ParsedRawSyntaxRecorder::recordDeferredNode(const ParsedRawSyntaxNode &node) {
ParsedRawSyntaxRecorder::recordDeferredNode(ParsedRawSyntaxNode &node) {
switch (node.getDataKind()) {
case RecordedOrDeferredNode::Kind::Null:
case RecordedOrDeferredNode::Kind::Recorded:
llvm_unreachable("Not deferred");
case RecordedOrDeferredNode::Kind::DeferredLayout: {
OpaqueSyntaxNode Data = SPActions->recordDeferredLayout(node.getData());
OpaqueSyntaxNode Data = SPActions->recordDeferredLayout(node.takeData());
return ParsedRawSyntaxNode(
Data, node.getRange(), node.getKind(), node.getTokenKind(),
ParsedRawSyntaxNode::DataKind::Recorded, node.isMissing());
}
case RecordedOrDeferredNode::Kind::DeferredToken: {
OpaqueSyntaxNode Data = SPActions->recordDeferredToken(node.getData());
OpaqueSyntaxNode Data = SPActions->recordDeferredToken(node.takeData());
return ParsedRawSyntaxNode(
Data, node.getRange(), node.getKind(), node.getTokenKind(),
ParsedRawSyntaxNode::DataKind::Recorded, node.isMissing());
@@ -158,7 +158,7 @@ ParsedRawSyntaxNode ParsedRawSyntaxRecorder::makeDeferred(
}
}
children[i] = node.getRecordedOrDeferredNode();
children[i] = node.takeRecordedOrDeferredNode();
}
auto data = SPActions->makeDeferredLayout(k, /*IsMissing=*/false, children);
return ParsedRawSyntaxNode(data, range, k, tok::NUM_TOKENS,
@@ -213,8 +213,9 @@ ParsedRawSyntaxNode
ParsedRawSyntaxRecorder::getDeferredChild(const ParsedRawSyntaxNode &parent,
size_t childIndex) const {
assert(parent.isDeferredLayout());
auto childInfo = SPActions->getDeferredChild(parent.getData(), childIndex,
parent.getRange().getStart());
auto childInfo = SPActions->getDeferredChild(
parent.getUnsafeDeferredOpaqueData(),
childIndex, parent.getRange().getStart());
return ParsedRawSyntaxNode(childInfo.Data, childInfo.Range,
childInfo.SyntaxKind, childInfo.TokenKind,
childInfo.SyntaxKind == syntax::SyntaxKind::Token
@@ -226,7 +227,7 @@ ParsedRawSyntaxRecorder::getDeferredChild(const ParsedRawSyntaxNode &parent,
size_t ParsedRawSyntaxRecorder::getDeferredNumChildren(
const ParsedRawSyntaxNode &node) const {
assert(node.isDeferredLayout());
return SPActions->getDeferredNumChildren(node.getData());
return SPActions->getDeferredNumChildren(node.getUnsafeDeferredOpaqueData());
}
#ifndef NDEBUG