diff --git a/src/lib_spark/spark/core/small_string.h b/src/lib_spark/spark/core/small_string.h index df2492142..cd535aee2 100644 --- a/src/lib_spark/spark/core/small_string.h +++ b/src/lib_spark/spark/core/small_string.h @@ -46,6 +46,7 @@ struct SmallString { void copy_from(std::string_view str); std::int32_t toi() const; + std::uint32_t tou() const; std::int64_t tol() const; std::uint64_t toul() const; @@ -183,10 +184,49 @@ std::int32_t SmallString::toi() const { "SmallString::toi failed because string is empty"); } std::int32_t rv = 0; - std::size_t i = length_ - 1; + std::size_t i = 0; + std::int32_t digit; + bool negate = false; do { - rv = rv * 10 + (data_[i] - '0'); - } while (i-- > 0); + digit = (data_[i] - '0'); + if (digit < 0 || digit > 9) { + if (i == 0 && length_ > 1) { + switch (data_[i]) { + case '+': + continue; + case '-': + negate = true; + continue; + } + } + throw std::logic_error("SmallString::toi failed due to invalid " + "format, must match ^(+-)?[0-9]+$"); + } + rv = rv * 10 + digit; + } while (++i < length_); + return negate ? -rv : rv; +} + +template +std::uint32_t SmallString::tou() const { + if (length_ == 0) { + throw std::logic_error( + "SmallString::tou failed because string is empty"); + } + std::uint32_t rv = 0; + std::size_t i = 0; + std::int32_t digit; + do { + digit = (data_[i] - '0'); + if (digit < 0 || digit > 9) { + if (i == 0 && length_ > 1 && data_[i] == '+') { + continue; + } + throw std::logic_error("SmallString::tou failed due to invalid " + "format, must match ^+?[0-9]+$"); + } + rv = rv * 10u + static_cast(digit); + } while (++i < length_); return rv; } @@ -197,11 +237,27 @@ std::int64_t SmallString::tol() const { "SmallString::tol failed because string is empty"); } std::int64_t rv = 0; - std::size_t i = length_ - 1; + std::size_t i = 0; + std::int32_t digit; + bool negate = false; do { - rv = rv * 10 + (data_[i] - '0'); - } while (i-- > 0); - return rv; + digit = (data_[i] - '0'); + if (digit < 0 || digit > 9) { + if (i == 0 && length_ > 1) { + switch (data_[i]) { + case '+': + continue; + case '-': + negate = true; + continue; + } + } + throw std::logic_error("SmallString::tol failed due to invalid " + "format, must match ^(+-)?[0-9]+$"); + } + rv = rv * 10 + digit; + } while (++i < length_); + return negate ? -rv : rv; } template @@ -211,10 +267,19 @@ std::uint64_t SmallString::toul() const { "SmallString::toul failed because string is empty"); } std::uint64_t rv = 0; - std::size_t i = length_ - 1; + std::size_t i = 0; + std::int32_t digit; do { - rv = rv * 10ul + static_cast(data_[i] - '0'); - } while (i-- > 0); + digit = (data_[i] - '0'); + if (digit < 0 || digit > 9) { + if (i == 0 && length_ > 1 && data_[i] == '+') { + continue; + } + throw std::logic_error("SmallString::toul failed due to invalid " + "format, must match ^+?[0-9]+$"); + } + rv = rv * 10ul + static_cast(digit); + } while (++i < length_); return rv; } diff --git a/src/lib_spark/spark/core/tests/small_string_tests.cpp b/src/lib_spark/spark/core/tests/small_string_tests.cpp index be71fb451..12fbeb0c1 100644 --- a/src/lib_spark/spark/core/tests/small_string_tests.cpp +++ b/src/lib_spark/spark/core/tests/small_string_tests.cpp @@ -30,6 +30,32 @@ TEST_CASE("small_string", "[core]") { small_str.clear(); REQUIRE(small_str.empty()); } + SECTION("numeric_parsing") { + // int + REQUIRE(SmallString<8>{"17"}.toi() == 17); + REQUIRE(SmallString<8>{"+17"}.toi() == 17); + REQUIRE(SmallString<8>{"-17"}.toi() == -17); + REQUIRE(SmallString<8>{"0"}.toi() == 0); + REQUIRE(SmallString<8>{"+0"}.toi() == 0); + REQUIRE(SmallString<8>{"-0"}.toi() == 0); + // uint + REQUIRE(SmallString<8>{"17"}.tou() == 17); + REQUIRE(SmallString<8>{"+17"}.tou() == 17); + REQUIRE(SmallString<8>{"0"}.tou() == 0); + REQUIRE(SmallString<8>{"+0"}.tou() == 0); + // long + REQUIRE(SmallString<8>{"17"}.tol() == 17); + REQUIRE(SmallString<8>{"+17"}.tol() == 17); + REQUIRE(SmallString<8>{"-17"}.tol() == -17); + REQUIRE(SmallString<8>{"0"}.tol() == 0); + REQUIRE(SmallString<8>{"+0"}.tol() == 0); + REQUIRE(SmallString<8>{"-0"}.tol() == 0); + // ulong + REQUIRE(SmallString<8>{"17"}.toul() == 17); + REQUIRE(SmallString<8>{"+17"}.toul() == 17); + REQUIRE(SmallString<8>{"0"}.toul() == 0); + REQUIRE(SmallString<8>{"+0"}.toul() == 0); + } } } // namespace bts::core::tests