diff options
| -rw-r--r-- | toolsrc/src/vcpkg-test/json.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/base/json.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/base/parse.cpp | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/toolsrc/src/vcpkg-test/json.cpp b/toolsrc/src/vcpkg-test/json.cpp index 6858a5ac8..b03fe2aec 100644 --- a/toolsrc/src/vcpkg-test/json.cpp +++ b/toolsrc/src/vcpkg-test/json.cpp @@ -234,7 +234,7 @@ TEST_CASE ("JSON track newlines", "[json]") auto res = Json::parse("{\n,", fs::u8path("filename")); REQUIRE(!res); REQUIRE(res.error()->format() == - R"(Error: filename:2:1: Unexpected character; expected property name + R"(filename:2:1: error: Unexpected character; expected property name on expression: , ^ )"); diff --git a/toolsrc/src/vcpkg/base/json.cpp b/toolsrc/src/vcpkg/base/json.cpp index d99fa7392..c287eae78 100644 --- a/toolsrc/src/vcpkg/base/json.cpp +++ b/toolsrc/src/vcpkg/base/json.cpp @@ -1062,7 +1062,7 @@ namespace vcpkg::Json ExpectedT<std::pair<Value, JsonStyle>, std::unique_ptr<Parse::IParseError>> parse(StringView json, const fs::path& filepath) noexcept { - return Parser::parse(json, fs::generic_u8string(filepath)); + return Parser::parse(json, fs::u8string(filepath)); } ExpectedT<std::pair<Value, JsonStyle>, std::unique_ptr<Parse::IParseError>> parse(StringView json, StringView origin) noexcept diff --git a/toolsrc/src/vcpkg/base/parse.cpp b/toolsrc/src/vcpkg/base/parse.cpp index a082c4d9c..fb1b4c3bf 100644 --- a/toolsrc/src/vcpkg/base/parse.cpp +++ b/toolsrc/src/vcpkg/base/parse.cpp @@ -34,13 +34,12 @@ namespace vcpkg::Parse caret_spacing.push_back(cp == '\t' ? '\t' : ' '); } - return Strings::concat("Error: ", - origin, + return Strings::concat(origin, ":", row, ":", column, - ": ", + ": error: ", message, "\n" " on expression: ", // 18 columns |