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

logic: fixed c/c++ indexing errors are not recorded inside macro expansion (issue #580)

Browse Source
This commit is contained in:
mlangkabel
2018-05-08 23:28:55 +02:00
parent e1df15a7b9
commit 331c3e8c26
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.cpp
+7 -1
View File
@@ -83,7 +83,13 @@ void CxxDiagnosticConsumer::HandleDiagnostic(clang::DiagnosticsEngine::Level lev
column = presumedLocation.getColumn();
}
const clang::FileEntry* fileEntry = sourceManager.getFileEntryForID(sourceManager.getFileID(info.getLocation()));
clang::SourceLocation loc = sourceManager.getExpansionLoc(info.getLocation());
if (loc.isInvalid())
{
loc = info.getLocation();
}
const clang::FileEntry* fileEntry = sourceManager.getFileEntryForID(sourceManager.getFileID(loc));
if (fileEntry != nullptr && fileEntry->isValid())
{
filePath = m_canonicalFilePathCache->getCanonicalFilePath(fileEntry);
src/test/CxxParserTestSuite.h
+12
View File
@@ -4057,6 +4057,18 @@ public:
));
}
void test_cxx_parser_catches_error_in_macro_expansion()
{
std::shared_ptr<TestParserClient> client = parseCode(
"#define MACRO_WITH_NONEXISTING_PATH \"this_path_does_not_exist.txt\"\n"
"#include MACRO_WITH_NONEXISTING_PATH\n"
);
TS_ASSERT(utility::containsElement<std::wstring>(
client->errors, L"'this_path_does_not_exist.txt' file not found <2:10 2:10>"
));
}
void test_cxx_parser_finds_location_of_line_comment()
{
std::shared_ptr<TestParserClient> client = parseCode(