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

[Parse] Optimize syntax parsing: Speed-up Lexer::lexTrivia()

Browse Source 
Introduce ParsedTrivia which is a more efficient structure to use during lexing than syntax::Trivia.
This commit is contained in:
Argyrios Kyrtzidis
2018-12-30 15:19:48 -08:00
parent 9fa91e97aa
commit c7ac859310
24 changed files with 285 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Parse/ParsedRawSyntaxRecorder.cpp
View File

@@ -18,29 +18,24 @@
#include "swift/Parse/ParsedRawSyntaxRecorder.h"
#include "swift/Parse/ParsedRawSyntaxNode.h"
#include "swift/Parse/ParsedTrivia.h"
#include "swift/Parse/SyntaxParseActions.h"
#include "swift/Parse/Token.h"
#include "swift/Syntax/SyntaxKind.h"
#include "swift/Syntax/Trivia.h"
using namespace swift;
using namespace swift::syntax;
ParsedRawSyntaxNode
ParsedRawSyntaxRecorder::recordToken(const Token &tok,
const Trivia &leadingTrivia,
const Trivia &trailingTrivia) {
SourceLoc tokLoc = tok.getLoc();
unsigned tokLength = tok.getLength();
if (tok.isEscapedIdentifier()) {
// Adjust to account for the backticks that are included in trivia.
tokLoc = tokLoc.getAdvancedLoc(1);
tokLength -= 2;
}
unsigned leadingTriviaLen = leadingTrivia.getTextLength();
unsigned trailingTriviaLen = trailingTrivia.getTextLength();
SourceLoc offset = tokLoc.getAdvancedLoc(-leadingTriviaLen);
unsigned length = leadingTriviaLen + tokLength + trailingTriviaLen;
const ParsedTrivia &leadingTrivia,
const ParsedTrivia &trailingTrivia) {
CharSourceRange tokRange = tok.getRangeWithoutBackticks();
unsigned leadingTriviaLen = leadingTrivia.getLength();
unsigned trailingTriviaLen = trailingTrivia.getLength();
SourceLoc offset = tokRange.getStart().getAdvancedLoc(-leadingTriviaLen);
unsigned length = leadingTriviaLen + tokRange.getByteLength() +
trailingTriviaLen;
CharSourceRange range{offset, length};
OpaqueSyntaxNode n = SPActions->recordToken(tok, leadingTrivia,
trailingTrivia, range);