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

logic: Added compilation database project setup

Browse Source 
* Added CDB option to project type selection
* show CDB source files in popup
* define header paths separately
* made generic content summary in wizzard and use it everywhere
* fixed file paths not canonical in analysis
* refactored wizzard content paths to use summary instead of subpaths
* refactored files popup to simpler communication with content

bug id = 35
This commit is contained in:
Eberhard Graether
2016-03-08 13:20:37 +01:00
parent 90c0d15d20
commit 8cc8f5d534
45 changed files with 919 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_parser/data/parser/cxx/ASTVisitor.cpp
+7 -10
View File
@@ -10,7 +10,6 @@
#include "data/parser/ParseLocation.h"
#include "utility/file/FileManager.h"
#include "utility/file/FileSystem.h"
#include "utility/ScopedSwitcher.h"
@@ -1004,9 +1003,7 @@ ParseLocation ASTVisitor::getDeclRefRange(clang::NamedDecl *decl, clang::SourceL
const clang::FileEntry* fileEntry = sourceManager.getFileEntryForID(fileId);
if (fileEntry != NULL)
{
std::string fielName = fileEntry->getName();
std::string filePath = FileSystem::absoluteFilePath(fielName);
parseLocation.filePath = FilePath(filePath);
parseLocation.filePath = FilePath(fileEntry->getName()).canonical();
}
}
@@ -1488,9 +1485,9 @@ bool ASTVisitor::isLocatedInUnparsedProjectFile(clang::SourceLocation loc)
const clang::FileEntry* fileEntry = sourceManager.getFileEntryForID(fileId);
if (fileEntry != NULL)
{
std::string fielName = fileEntry->getName();
std::string filePath = FileSystem::absoluteFilePath(fielName);
ret = m_fileRegister->includeFileIsParsing(filePath);
std::string fileName = fileEntry->getName();
FilePath filePath = FilePath(fileName).canonical();
ret = m_fileRegister->includeFileIsParsing(filePath.str());
}
}
m_inUnparsedProjectFileMap[fileId] = ret;
@@ -1522,9 +1519,9 @@ bool ASTVisitor::isLocatedInProjectFile(clang::SourceLocation loc)
const clang::FileEntry* fileEntry = sourceManager.getFileEntryForID(fileId);
if (fileEntry != NULL)
{
std::string fielName = fileEntry->getName();
std::string filePath = FileSystem::absoluteFilePath(fielName);
bool ret = m_fileRegister->getFileManager()->hasFilePath(filePath);
std::string fileName = fileEntry->getName();
FilePath filePath = FilePath(fileName).canonical();
bool ret = m_fileRegister->getFileManager()->hasFilePath(filePath.str());
m_inProjectFileMap[fileId] = ret;
return ret;
}