feedc0de/espconfiglib
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add StringOr and StringAnd with 3 constraints

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-10-25 18:55:34 +02:00
parent 64af48aca0
commit 5fb2ec097a
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/configconstraints_base.h
View File

@@ -52,6 +52,21 @@ ConfigConstraintReturnType StringOr(const std::string &str)
return tl::make_unexpected(fmt::format("None of the following 2 constraints succeded: {} | {}", result0.error(), result1.error())); return tl::make_unexpected(fmt::format("None of the following 2 constraints succeded: {} | {}", result0.error(), result1.error()));
} }
template<ConfigWrapper<std::string>::ConstraintCallback callback0, ConfigWrapper<std::string>::ConstraintCallback callback1, ConfigWrapper<std::string>::ConstraintCallback callback2>
ConfigConstraintReturnType StringOr(const std::string &str)
{
const auto result0 = callback0(str);
if (result0)
return {};
const auto result1 = callback1(str);
if (result1)
return {};
const auto result2 = callback2(str);
if (result2)
return {};
return tl::make_unexpected(fmt::format("None of the following 3 constraints succeded: {} | {} | {}", result0.error(), result1.error(), result2.error()));
}
template<ConfigWrapper<std::string>::ConstraintCallback callback0, ConfigWrapper<std::string>::ConstraintCallback callback1> template<ConfigWrapper<std::string>::ConstraintCallback callback0, ConfigWrapper<std::string>::ConstraintCallback callback1>
ConfigConstraintReturnType StringAnd(const std::string &str) ConfigConstraintReturnType StringAnd(const std::string &str)
{ {
@@ -62,6 +77,18 @@ ConfigConstraintReturnType StringAnd(const std::string &str)
return {}; return {};
} }
template<ConfigWrapper<std::string>::ConstraintCallback callback0, ConfigWrapper<std::string>::ConstraintCallback callback1, ConfigWrapper<std::string>::ConstraintCallback callback2>
ConfigConstraintReturnType StringAnd(const std::string &str)
{
if (const auto result = callback0(str); !result)
return tl::make_unexpected(result.error());
if (const auto result = callback1(str); !result)
return tl::make_unexpected(result.error());
if (const auto result = callback2(str); !result)
return tl::make_unexpected(result.error());
return {};
}
template<typename T, T ... ALLOWED_VALUES> template<typename T, T ... ALLOWED_VALUES>
ConfigConstraintReturnType OneOf(typename ConfigWrapper<T>::value_t val) ConfigConstraintReturnType OneOf(typename ConfigWrapper<T>::value_t val)
{ {