Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-16 13:48:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Condense parser error messages

Browse Source
This commit is contained in:
GriffinR
2025-02-18 14:53:25 -05:00
parent 00e71afd7d
commit 17c35a8d98
7 changed files with 135 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/orderedjson.cpp
View File

@@ -393,7 +393,7 @@ struct JsonParser final {
*/
const QString &str;
int i;
QString &err;
QString *err;
bool failed;
const JsonParse strategy;
@@ -407,8 +407,8 @@ struct JsonParser final {
template <typename T>
T fail(QString &&msg, const T err_ret) {
if (!failed)
err = std::move(msg);
if (!failed && err)
*err = std::move(msg);
failed = true;
return err_ret;
}
@@ -775,7 +775,7 @@ struct JsonParser final {
};
}//namespace {
Json Json::parse(const QString &in, QString &err, JsonParse strategy) {
Json Json::parse(const QString &in, QString *err, JsonParse strategy) {
JsonParser parser { in, 0, err, false, strategy };
Json result = parser.parse_json(0);