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

data: fixes in TokenLocations

Browse Source 
* TokenLocations for used datatypes are more precise now.
* added -c option to parser to indicate that no executable will be built.
This commit is contained in:
malte_langkabel
2014-10-13 16:19:50 +02:00
parent f41e1c429d
commit e91d5474b6
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/parser/cxx/ASTVisitor.cpp
+10 -8
View File
@@ -1,5 +1,7 @@
#include "data/parser/cxx/ASTVisitor.h"
#include <clang/Lex/Lexer.h>
#include "data/parser/cxx/ASTBodyVisitor.h"
#include "data/parser/cxx/utilityCxx.h"
#include "data/parser/ParseFunction.h"
@@ -398,8 +400,8 @@ ParseLocation ASTVisitor::getParseLocation(const clang::SourceRange& sourceRange
}
const clang::SourceManager& sourceManager = m_context->getSourceManager();
const clang::PresumedLoc& presumedBegin = sourceManager.getPresumedLoc(sourceRange.getBegin());
const clang::PresumedLoc& presumedEnd = sourceManager.getPresumedLoc(sourceRange.getEnd());
const clang::PresumedLoc& presumedBegin = sourceManager.getPresumedLoc(sourceRange.getBegin(), false);
const clang::PresumedLoc& presumedEnd = sourceManager.getPresumedLoc(sourceRange.getEnd(), false);
return ParseLocation(
presumedBegin.getFilename(),
@@ -456,13 +458,13 @@ ParseTypeUsage ASTVisitor::getParseTypeUsage(clang::TypeLoc typeLoc, const clang
if (!typeLoc.isNull())
{
while (typeLoc.getNextTypeLoc())
{
typeLoc = typeLoc.getNextTypeLoc();
}
clang::SourceRange sr(
typeLoc.getLocStart(),
clang::Lexer::getLocForEndOfToken(typeLoc.getLocEnd(), 0, m_context->getSourceManager(), clang::LangOptions())
);
parseLocation = getParseLocation(typeLoc.getSourceRange());
parseLocation.endColumnNumber += dataType.getRawTypeName().size() - 1;
parseLocation = getParseLocation(sr);
parseLocation.endColumnNumber -= 1;
}
return ParseTypeUsage(parseLocation, dataType);
src/lib/data/parser/cxx/CxxParser.cpp
+3
View File
@@ -26,6 +26,9 @@ void CxxParser::parseFiles(
// verbose
// args.push_back("-v");
// The option -c signals that no executable is built.
args.push_back("-c");
// The option '-x c++' treats subsequent input files as C++.
args.push_back("-x");
args.push_back("c++");