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 ParsedRawSyntaxNode::copyDeferred

Browse Source 
This is no longer needed.
This commit is contained in:
Alex Hoppen
2021-03-01 11:13:22 +01:00
parent e8f9272532
commit c13cf2c21c
4 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/swift/Parse/ParsedRawSyntaxNode.h
View File

@@ -187,17 +187,6 @@ public:
return copy;
}
ParsedRawSyntaxNode copyDeferred() const {
assert(isDeferredLayout() || isDeferredToken() && "node not deferred");
ParsedRawSyntaxNode copy;
copy.Data = Data;
copy.Range = Range;
copy.SynKind = SynKind;
copy.TokKind = TokKind;
copy.IsMissing = IsMissing;
return copy;
}
#ifndef NDEBUG
bool ensureDataIsNotRecorded() {
if (getDataKind() != DataKind::Recorded)

4
include/swift/Parse/ParsedSyntax.h
View File

@@ -43,10 +43,6 @@ public:
return T(std::move(RawNode));
}
ParsedSyntax copyDeferred() const {
return ParsedSyntax { RawNode.copyDeferred() };
}
static bool kindof(syntax::SyntaxKind Kind) {
return true;
}

2
lib/Parse/ParsedRawSyntaxRecorder.cpp
View File

@@ -231,7 +231,7 @@ size_t ParsedRawSyntaxRecorder::getDeferredNumChildren(
void ParsedRawSyntaxRecorder::verifyElementRanges(ArrayRef<ParsedRawSyntaxNode> elements) {
SourceLoc prevEndLoc;
for (const auto &elem: elements) {
if (elem.isMissing() || elem.isNull())
if (elem.isNull() || elem.isMissing())
continue;
CharSourceRange range = elem.getRange();
if (range.isValid()) {

4
lib/Parse/ParsedSyntaxNodes.cpp.gyb
View File

@@ -31,11 +31,11 @@ Parsed${node.name}::getDeferred${child.name}(const SyntaxParsingContext *SyntaxC
auto RawChild = getRaw().getDeferredChild(${node.name}::Cursor::${child.name}, SyntaxContext);
if (RawChild.isNull())
return None;
return Parsed${child.type_name} {RawChild.copyDeferred()};
return Parsed${child.type_name}(std::move(RawChild));
}
% else:
Parsed${child.type_name} Parsed${node.name}::getDeferred${child.name}(const SyntaxParsingContext *SyntaxContext) {
return Parsed${child.type_name} {getRaw().getDeferredChild(${node.name}::Cursor::${child.name}, SyntaxContext).copyDeferred()};
return Parsed${child.type_name} {getRaw().getDeferredChild(${node.name}::Cursor::${child.name}, SyntaxContext)};
}
% end