ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: fix infinite loop

Browse Source 
* fixed a loop that might be running indefinitely while looking for the correct source location of an identifier.
This commit is contained in:
malte_langkabel
2015-12-03 16:26:00 +01:00
parent 0424162acb
commit 32db79a675
3 changed files with 9 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/parser/cxx/ASTVisitor.cpp
+8 -18
View File
@@ -218,7 +218,7 @@ bool ASTVisitor::VisitCXXConstructorDecl(clang::CXXConstructorDecl* declaration)
if (init->isMemberInitializer())
{
m_client->onFieldUsageParsed(
getParseLocationForIdentifier(init->getMemberLocation()),
getParseLocationForTokenAtLocation(init->getMemberLocation()),
getParseFunction(declaration),
utility::getDeclNameHierarchy(init->getMember())
);
@@ -894,7 +894,7 @@ ParseLocation ASTVisitor::getParseLocation(const clang::SourceRange& sourceRange
);
}
ParseLocation ASTVisitor::getParseLocationForIdentifier(const clang::SourceLocation& loc) const
ParseLocation ASTVisitor::getParseLocationForTokenAtLocation(const clang::SourceLocation& loc) const
{
if (loc.isInvalid())
{
@@ -902,35 +902,25 @@ ParseLocation ASTVisitor::getParseLocationForIdentifier(const clang::SourceLocat
}
const clang::SourceManager& sourceManager = m_context->getSourceManager();
const clang::PresumedLoc& presumedBegin = sourceManager.getPresumedLoc(loc);
clang::Token identifierToken;
clang::Lexer::getRawToken(loc, identifierToken, sourceManager, clang::LangOptions());
clang::tok::TokenKind tokenKind = identifierToken.getKind();
while (
tokenKind != clang::tok::TokenKind::identifier &&
tokenKind != clang::tok::TokenKind::raw_identifier
)
{
const clang::PresumedLoc& presumedEndss = sourceManager.getPresumedLoc(identifierToken.getEndLoc());
clang::Lexer::getRawToken(identifierToken.getEndLoc(), identifierToken, sourceManager, clang::LangOptions());
tokenKind = identifierToken.getKind();
}
clang::SourceLocation startLoc = clang::Lexer::GetBeginningOfToken(loc, sourceManager, clang::LangOptions());
clang::SourceLocation endLoc = clang::Lexer::getLocForEndOfToken(loc, 1, sourceManager, clang::LangOptions());
const clang::PresumedLoc& presumedEnd = sourceManager.getPresumedLoc(identifierToken.getEndLoc());
const clang::PresumedLoc& presumedBegin = sourceManager.getPresumedLoc(startLoc);
const clang::PresumedLoc& presumedEnd = sourceManager.getPresumedLoc(endLoc);
return ParseLocation(
presumedBegin.getFilename(),
presumedBegin.getLine(),
presumedBegin.getColumn(),
presumedEnd.getLine(),
presumedEnd.getColumn() - 1
presumedEnd.getColumn()
);
}
ParseLocation ASTVisitor::getParseLocationForNamedDecl(const clang::NamedDecl* decl) const
{
return getParseLocationForIdentifier(decl->getLocation());
return getParseLocationForTokenAtLocation(decl->getLocation());
}
ParseLocation ASTVisitor::getParseLocationOfFunctionBody(const clang::FunctionDecl* decl) const
src/lib/data/parser/cxx/ASTVisitor.h
+1 -1
View File
@@ -70,7 +70,7 @@ private:
ParserClient::AbstractionType getAbstractionType(const clang::CXXMethodDecl* methodDecl) const;
ParseLocation getParseLocation(const clang::SourceRange& sourceRange) const;
ParseLocation getParseLocationForIdentifier(const clang::SourceLocation& loc) const;
ParseLocation getParseLocationForTokenAtLocation(const clang::SourceLocation& loc) const;
ParseLocation getParseLocationForNamedDecl(const clang::NamedDecl* decl) const;
ParseLocation getParseLocationOfFunctionBody(const clang::FunctionDecl* decl) const;
ParseLocation getParseLocationOfRecordBody(clang::CXXRecordDecl* decl) const;