Common: update 'ReadNumericOrDefault' to 'ReadNumericFromJson' and have it return an optional, this provides the caller with more flexibility

This commit is contained in:
iwubcode
2024-03-20 17:27:02 -05:00
parent 85dee300b5
commit 69694494ce
2 changed files with 7 additions and 7 deletions

View File

@ -3,6 +3,7 @@
#pragma once
#include <optional>
#include <string>
#include <picojson.h>
@ -29,14 +30,13 @@ picojson::array ToJsonArray(const Range& data)
}
template <typename Type>
Type ReadNumericOrDefault(const picojson::object& obj, const std::string& key,
Type default_value = Type{})
std::optional<Type> ReadNumericFromJson(const picojson::object& obj, const std::string& key)
{
const auto it = obj.find(key);
if (it == obj.end())
return default_value;
return std::nullopt;
if (!it->second.is<double>())
return default_value;
return std::nullopt;
return MathUtil::SaturatingCast<Type>(it->second.get<double>());
}