philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Support arbitrary numeric types for settings

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-13 17:54:05 +02:00
parent 0bf34de43b
commit 6bd9576aeb
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/libutil/config.cc
View file

@ -74,17 +74,25 @@ template<> std::string Setting<std::string>::to_string()
return value; return value;
} }
template<> void Setting<int>::set(const std::string & str) template<typename T>
void Setting<T>::set(const std::string & str)
{ {
static_assert(std::is_integral<T>::value, "Integer required.");
try { try {
value = std::stoi(str); auto i = std::stoll(str);
} catch (...) { if (i < std::numeric_limits<T>::min() ||
i > std::numeric_limits<T>::max())
throw UsageError("setting '%s' has out-of-range value %d", name, i);
value = i;
} catch (std::logic_error&) {
throw UsageError("setting '%s' has invalid value '%s'", name, str); throw UsageError("setting '%s' has invalid value '%s'", name, str);
} }
} }
template<> std::string Setting<int>::to_string() template<typename T>
std::string Setting<T>::to_string()
{ {
static_assert(std::is_integral<T>::value, "Integer required.");
return std::to_string(value); return std::to_string(value);
} }
@ -103,6 +111,11 @@ template<> std::string Setting<bool>::to_string()
return value ? "true" : "false"; return value ? "true" : "false";
} }
template class Setting<int>;
template class Setting<unsigned int>;
template class Setting<long>;
template class Setting<size_t>;
void PathSetting::set(const std::string & str) void PathSetting::set(const std::string & str)
{ {
if (str == "") { if (str == "") {