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

logic: Store locations of errors in source_location table of DB

Browse Source
This commit is contained in:
mlangkabel
2018-11-30 16:02:10 +01:00
parent 34691a0555
commit a51799c279
23 changed files with 290 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/helper/TestIntermediateStorage.h
+17 -12
View File
@@ -44,6 +44,7 @@ public:
std::multimap<Id, StorageSourceLocation> signatureLocationMap;
std::multimap<Id, StorageSourceLocation> localSymbolLocationMap;
std::multimap<Id, StorageSourceLocation> qualifierLocationMap;
std::multimap<Id, StorageSourceLocation> errorLocationMap;
std::vector<StorageSourceLocation> commentLocations;
for (const StorageSourceLocation& location : getStorageSourceLocations())
{
@@ -53,7 +54,7 @@ public:
elementIds.emplace_back(it->second);
}
if (!elementIds.size())
if (elementIds.empty())
{
elementIds.emplace_back(0);
}
@@ -92,6 +93,12 @@ public:
signatureLocationMap.emplace(elementId, location);
}
break;
case LOCATION_ERROR:
if (elementId)
{
errorLocationMap.emplace(elementId, location);
}
break;
case LOCATION_COMMENT:
commentLocations.emplace_back(location);
break;
@@ -262,18 +269,16 @@ public:
addLine(L"COMMENT: comment" + addFileName(locStr, filePathMap[location.fileNodeId]));
}
for (const StorageErrorData& error : getErrors())
for (const StorageError& error : getErrors())
{
std::wstring locStr = addLocationStr(
L"",
StorageSourceLocation(
0, 0, error.lineNumber, error.columnNumber, error.lineNumber, error.columnNumber,
locationTypeToInt(LOCATION_ERROR)
)
);
errors.emplace_back(error.message + locStr);
addLine(L"ERROR: " + error.message + addFileName(locStr, FilePath(error.filePath)));
for (auto errorLocationIt = errorLocationMap.find(error.id);
errorLocationIt != errorLocationMap.end() && errorLocationIt->first == error.id;
errorLocationIt++)
{
std::wstring locStr = addLocationStr(L"", errorLocationIt->second);
errors.emplace_back(error.message + locStr);
addLine(L"ERROR: " + error.message + addFileName(locStr, filePathMap[errorLocationIt->second.fileNodeId]));
}
}
}