Skip to content

Commit dc8eed4

Browse files
committed
[libSyntax] Delete discardRecordedNode
It doesn't do anything anymore and we shouldn't have it, so let's just remove it.
1 parent 76fbae1 commit dc8eed4

File tree

7 files changed

+0
-28
lines changed

7 files changed

+0
-28
lines changed

include/swift/Parse/ParsedRawSyntaxRecorder.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ class ParsedRawSyntaxRecorder final {
6767
ParsedRawSyntaxNode recordEmptyRawSyntaxCollection(syntax::SyntaxKind kind,
6868
SourceLoc loc);
6969

70-
void discardRecordedNode(ParsedRawSyntaxNode &node);
71-
7270
/// Used for incremental re-parsing.
7371
ParsedRawSyntaxNode lookupNode(size_t lexerOffset, SourceLoc loc,
7472
syntax::SyntaxKind kind);

include/swift/Parse/SyntaxParseActions.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ class SyntaxParseActions {
6262
virtual Optional<syntax::SourceFileSyntax>
6363
realizeSyntaxRoot(OpaqueSyntaxNode root, const SourceFile &SF) = 0;
6464

65-
/// Discard raw syntax node.
66-
///
67-
/// FIXME: This breaks invariant that any recorded node will be a part of the
68-
/// result SourceFile syntax. This method is a temporary workaround, and
69-
/// should be removed when we fully migrate to libSyntax parsing.
70-
virtual void discardRecordedNode(OpaqueSyntaxNode node) = 0;
71-
7265
/// Used for incremental re-parsing.
7366
virtual std::pair<size_t, OpaqueSyntaxNode>
7467
lookupNode(size_t lexerOffset, syntax::SyntaxKind kind) {

include/swift/SyntaxParse/SyntaxTreeCreator.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ class SyntaxTreeCreator: public SyntaxParseActions {
7373
ArrayRef<OpaqueSyntaxNode> elements,
7474
CharSourceRange range) override;
7575

76-
void discardRecordedNode(OpaqueSyntaxNode node) override;
77-
7876
std::pair<size_t, OpaqueSyntaxNode>
7977
lookupNode(size_t lexerOffset, syntax::SyntaxKind kind) override;
8078
};

lib/Parse/ParsedRawSyntaxRecorder.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ ParsedRawSyntaxRecorder::recordEmptyRawSyntaxCollection(SyntaxKind kind,
112112
return ParsedRawSyntaxNode{kind, tok::unknown, range, n};
113113
}
114114

115-
void ParsedRawSyntaxRecorder::discardRecordedNode(ParsedRawSyntaxNode &node) {
116-
SPActions->discardRecordedNode(node.takeOpaqueNode());
117-
}
118-
119115
ParsedRawSyntaxNode
120116
ParsedRawSyntaxRecorder::lookupNode(size_t lexerOffset, SourceLoc loc,
121117
SyntaxKind kind) {

lib/Parse/SyntaxParsingContext.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,6 @@ SyntaxParsingContext::~SyntaxParsingContext() {
405405
// Remove all parts in this context.
406406
case AccumulationMode::Discard: {
407407
auto &nodes = getStorage();
408-
for (auto i = nodes.begin()+Offset, e = nodes.end(); i != e; ++i) {
409-
// FIXME: This should not be needed. This breaks invariant that any
410-
// recorded node must be a part of result souce syntax tree.
411-
if (i->isRecorded())
412-
getRecorder().discardRecordedNode(*i);
413-
}
414408
nodes.erase(nodes.begin()+Offset, nodes.end());
415409
break;
416410
}

lib/SyntaxParse/SyntaxTreeCreator.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,3 @@ SyntaxTreeCreator::lookupNode(size_t lexerOffset, syntax::SyntaxKind kind) {
165165
size_t length = raw->getTextLength();
166166
return {length, static_cast<OpaqueSyntaxNode>(raw)};
167167
}
168-
169-
void SyntaxTreeCreator::discardRecordedNode(OpaqueSyntaxNode opaqueN) {
170-
}

tools/libSwiftSyntaxParser/libSwiftSyntaxParser.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,6 @@ class CLibParseActions : public SyntaxParseActions {
197197
return None;
198198
}
199199

200-
void discardRecordedNode(OpaqueSyntaxNode node) override {
201-
// FIXME: This method should not be called at all.
202-
}
203-
204200
std::pair<size_t, OpaqueSyntaxNode>
205201
lookupNode(size_t lexerOffset, SyntaxKind kind) override {
206202
auto NodeLookup = getNodeLookup();

0 commit comments

Comments
 (0)