mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'json-errors-filename'

Browse Source 
f134468a98 JSON: Improve JSON error message formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10463
This commit is contained in:
Brad King
2025-03-14 16:16:44 +00:00
committed by Kitware Robot
parent 3d8954cd20 f134468a98
commit 2604f5d8b3
44 changed files with 80 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmJSONState.h
View File

@@ -9,8 +9,6 @@
#include <utility>
#include <vector>
#include "cmStringAlgorithms.h"
namespace Json {
class Value;
}
@@ -26,7 +24,7 @@ class cmJSONState
public:
using JsonPair = std::pair<std::string const, Json::Value const*>;
cmJSONState() = default;
cmJSONState(std::string const& filename, Json::Value* root);
cmJSONState(std::string jsonFile, Json::Value* root);
void AddError(std::string const& errMsg);
void AddErrorAtValue(std::string const& errMsg, Json::Value const* value);
void AddErrorAtOffset(std::string const& errMsg, std::ptrdiff_t offset);
@@ -46,15 +44,7 @@ public:
Error(std::string errMsg)
: location({ -1, -1 })
, message(std::move(errMsg)) {};
std::string GetErrorMessage() const
{
std::string output = message;
if (location.line > 0) {
output = cmStrCat("Error: @", location.line, ",", location.column,
": ", output);
}
return output;
}
std::string GetErrorMessage() const { return message; }
Location GetLocation() const { return location; }
private:
@@ -70,4 +60,5 @@ public:
private:
std::string GetJsonContext(Location loc);
Location LocateInDocument(ptrdiff_t offset);
std::string Filename;
};