system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 10:36:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK: Trim whitespace in StringUtils::convert_to_{int,uint,uint_from_hex}()

Browse source 
Personally I found this unintuitive at first, but it is in line with
strtol(), Python's int() or JavaScript's parseInt(), so I guess it makes
sense.

Fixes #4097.
This commit is contained in:
Linus Groh 2020-11-16 18:30:22 +00:00 committed by Andreas Kling
parent 0cb16ffe08
commit d6a4c0c79e
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
AK/StringUtils.cpp
View file

@ -98,22 +98,23 @@ bool matches(const StringView& str, const StringView& mask, CaseSensitivity case
Optional<int> convert_to_int(const StringView& str)
{
if (str.is_empty())
auto str_trimmed = str.trim_whitespace();
if (str_trimmed.is_empty())
return {};
bool negative = false;
size_t i = 0;
const auto characters = str.characters_without_null_termination();
const auto characters = str_trimmed.characters_without_null_termination();
if (characters[0] == '-' || characters[0] == '+') {
if (str.length() == 1)
if (str_trimmed.length() == 1)
return {};
i++;
negative = (characters[0] == '-');
}
int value = 0;
for (; i < str.length(); i++) {
for (; i < str_trimmed.length(); i++) {
if (characters[i] < '0' || characters[i] > '9')
return {};
value = value * 10;
@ -124,13 +125,14 @@ Optional<int> convert_to_int(const StringView& str)
Optional<unsigned> convert_to_uint(const StringView& str)
{
if (str.is_empty())
auto str_trimmed = str.trim_whitespace();
if (str_trimmed.is_empty())
return {};
unsigned value = 0;
const auto characters = str.characters_without_null_termination();
const auto characters = str_trimmed.characters_without_null_termination();
for (size_t i = 0; i < str.length(); i++) {
for (size_t i = 0; i < str_trimmed.length(); i++) {
if (characters[i] < '0' || characters[i] > '9')
return {};
@ -142,14 +144,15 @@ Optional<unsigned> convert_to_uint(const StringView& str)
Optional<unsigned> convert_to_uint_from_hex(const StringView& str)
{
if (str.is_empty())
auto str_trimmed = str.trim_whitespace();
if (str_trimmed.is_empty())
return {};
unsigned value = 0;
const auto count = str.length();
const auto count = str_trimmed.length();
for (size_t i = 0; i < count; i++) {
char digit = str[i];
char digit = str_trimmed[i];
u8 digit_val;
if (digit >= '0' && digit <= '9') {

8
AK/Tests/TestStringUtils.cpp
View file

@ -130,6 +130,10 @@ TEST_CASE(convert_to_int)
actual = AK::StringUtils::convert_to_int("-12345");
EXPECT_EQ(actual.has_value(), true);
EXPECT_EQ(actual.value(), -12345);
actual = AK::StringUtils::convert_to_int(" \t-12345 \n\n");
EXPECT_EQ(actual.has_value(), true);
EXPECT_EQ(actual.value(), -12345);
}
TEST_CASE(convert_to_uint)
@ -170,6 +174,10 @@ TEST_CASE(convert_to_uint)
actual = AK::StringUtils::convert_to_uint("12345");
EXPECT_EQ(actual.has_value(), true);
EXPECT_EQ(actual.value(), 12345u);
actual = AK::StringUtils::convert_to_uint(" \t12345 \n\n");
EXPECT_EQ(actual.has_value(), true);
EXPECT_EQ(actual.value(), 12345u);
}
TEST_CASE(ends_with)