mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-22 07:04:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Automatically get float label type in most cases (#463)

Browse Source 
* automatically get float type in most cases

* try harder to print json errors

* fix test
This commit is contained in:
water111
2021-05-11 21:57:05 -04:00
committed by GitHub
parent 0599d144f8
commit 223adeeb0c
8 changed files with 37 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/util/json_util.cpp
+12 -2
View File
@@ -1,3 +1,4 @@
#include "common/log/log.h"
#include "common/util/assert.h"
#include "json_util.h"
@@ -75,8 +76,17 @@ std::string strip_cpp_style_comments(const std::string& input) {
* Parse JSON file with comments stripped. Unlike the default comment stripping feature
* of nlohmann::json, this allows you to have multiple comments in a row!
*/
nlohmann::json parse_commented_json(const std::string& input) {
return nlohmann::json::parse(strip_cpp_style_comments(input));
nlohmann::json parse_commented_json(const std::string& input, const std::string& source_name) {
try {
return nlohmann::json::parse(strip_cpp_style_comments(input));
} catch (const std::exception& e) {
if (source_name.empty()) {
lg::error("Error parsing JSON file: {}", e.what());
} else {
lg::error("Error parsing JSON in file {}: {}", source_name, e.what());
}
throw;
}
}
/*!