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: Root parsing context should hold a reference to the current token in the parser, NFC.

Browse Source 
Since all parsing contexts need a reference to the current token of the
parser, we should pass the token reference to the root context. Therefore, the derived
sub-contexts can just copy it while being spawned.
This commit is contained in:
Xi Ge
2017-11-02 12:27:10 -07:00
parent 295c7f3158
commit 19caca7890
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Syntax/SyntaxParsingContext.cpp
View File

@@ -180,12 +180,13 @@ SyntaxParsingContext::ContextInfo::createFromBack(SyntaxKind Kind, unsigned N) {
assert(Size - N + 1 == PendingSyntax.size());
}
SyntaxParsingContext::SyntaxParsingContext(SourceFile &SF, unsigned BufferID):
ContextData(*new ContextInfo(SF, BufferID)) {}
SyntaxParsingContext::
SyntaxParsingContext(SourceFile &SF, unsigned BufferID, Token &Tok):
ContextData(*new ContextInfo(SF, BufferID)), Tok(Tok) {}
SyntaxParsingContext::SyntaxParsingContext(SyntaxParsingContext &Another):
ContextData(*new ContextInfo(Another.ContextData.allTokens(),
Another.ContextData.Enabled)) {}
Another.ContextData.Enabled)), Tok(Another.Tok) {}
SyntaxParsingContext::~SyntaxParsingContext() { delete &ContextData; }
@@ -240,9 +241,9 @@ SyntaxParsingContextRoot &SyntaxParsingContextChild::getRoot() {
SyntaxParsingContextChild::
SyntaxParsingContextChild(SyntaxParsingContext *&ContextHolder,
SyntaxContextKind Kind, Token &Tok):
SyntaxContextKind Kind):
SyntaxParsingContext(*ContextHolder), Parent(ContextHolder),
ContextHolder(ContextHolder), Kind(Kind), Tok(Tok) {
ContextHolder(ContextHolder), Kind(Kind) {
ContextHolder = this;
if (ContextData.Enabled)
ContextData.setContextStart(Tok.getLoc());