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

[Lexer] Eliminate unnecessary calls to TriviaLexer::lexTrivia

Browse Source 
If the lexer itself keeps track of where the first comment of a token
starts, we can avoid parsing trivia into pieces.
This commit is contained in:
Alex Hoppen
2021-02-03 13:21:23 +01:00
parent b6746f008f
commit a8c01365b8
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Parse/Lexer.cpp
View File

@@ -283,14 +283,8 @@ void Lexer::formToken(tok Kind, const char *TokStart) {
}
unsigned CommentLength = 0;
if (RetainComments == CommentRetentionMode::AttachToNextToken) {
auto LeadingTriviaPieces = TriviaLexer::lexTrivia(LeadingTrivia);
// 'CommentLength' here is the length from the *first* comment to the
// token text (or its backtick if exist).
auto Iter = llvm::find_if(LeadingTriviaPieces, [](const ParsedTriviaPiece &Piece) {
return isCommentTriviaKind(Piece.getKind());
});
for (auto End = LeadingTriviaPieces.end(); Iter != End; Iter++) {
CommentLength += Iter->getLength();
if (CommentStart) {
CommentLength = TokStart - CommentStart;
}
}
@@ -2533,6 +2527,7 @@ Token Lexer::getTokenAtLocation(const SourceManager &SM, SourceLoc Loc,
StringRef Lexer::lexTrivia(bool IsForTrailingTrivia) {
const char *AllTriviaStart = CurPtr;
CommentStart = nullptr;
Restart:
const char *TriviaStart = CurPtr;
@@ -2562,10 +2557,16 @@ Restart:
// Don't try to lex comments here if we are lexing comments as Tokens.
break;
} else if (*CurPtr == '/') {
if (CommentStart == nullptr) {
CommentStart = CurPtr - 1;
}
// '// ...' comment.
skipSlashSlashComment(/*EatNewline=*/false);
goto Restart;
} else if (*CurPtr == '*') {
if (CommentStart == nullptr) {
CommentStart = CurPtr - 1;
}
// '/* ... */' comment.
skipSlashStarComment();
goto Restart;