From f54cec4db7c67b623383c140159e1171876ace89 Mon Sep 17 00:00:00 2001 From: Treeston Date: Fri, 28 Aug 2020 23:35:12 +0200 Subject: Common/Utilities: Make StringTo's signature match that of the other integral types, making for easier templating. Default behavior unchanged. --- src/common/Utilities/StringConvert.h | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'src/common/Utilities/StringConvert.h') diff --git a/src/common/Utilities/StringConvert.h b/src/common/Utilities/StringConvert.h index fbdc41f6aef..f264c0222fa 100644 --- a/src/common/Utilities/StringConvert.h +++ b/src/common/Utilities/StringConvert.h @@ -146,13 +146,24 @@ namespace Trinity::Impl::StringConvertImpl template <> struct For { - static Optional FromString(std::string_view str) + static Optional FromString(std::string_view str, int strict = 0) /* this is int to match the signature for "proper" integral types */ { - if ((str == "1") || StringEqualI(str, "y") || StringEqualI(str, "on") || StringEqualI(str, "yes") || StringEqualI(str, "true")) - return true; - if ((str == "0") || StringEqualI(str, "n") || StringEqualI(str, "off") || StringEqualI(str, "no") || StringEqualI(str, "false")) - return false; - return std::nullopt; + if (strict) + { + if (str == "1") + return true; + if (str == "0") + return false; + return std::nullopt; + } + else + { + if ((str == "1") || StringEqualI(str, "y") || StringEqualI(str, "on") || StringEqualI(str, "yes") || StringEqualI(str, "true")) + return true; + if ((str == "0") || StringEqualI(str, "n") || StringEqualI(str, "off") || StringEqualI(str, "no") || StringEqualI(str, "false")) + return false; + return std::nullopt; + } } static std::string ToString(bool val) -- cgit v1.2.3