RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-31 15:37:47 +00:00
Code Issues Activity Actions

AK: Make String::{starts,ends}_with(code_point) handle non-ASCII

Browse source 
We currently pass the code point to StringView::{starts,ends}_with,
which actually accepts a single char, thus cannot handle non-ASCII
code points.
This commit is contained in:
Timothy Flynn 2023-03-08 08:56:02 -05:00 • committed by Linus Groh
parent f61e65a609
commit f882581e91
3 changed files with 98 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
AK/String.cpp
View file

@ -496,7 +496,10 @@ bool String::contains(char needle, CaseSensitivity case_sensitivity) const
bool String::starts_with(u32 code_point) const
{
return bytes_as_string_view().starts_with(code_point);
if (is_empty())
return false;
return *code_points().begin() == code_point;
}
bool String::starts_with_bytes(StringView bytes) const
@ -506,7 +509,14 @@ bool String::starts_with_bytes(StringView bytes) const
bool String::ends_with(u32 code_point) const
{
return bytes_as_string_view().ends_with(code_point);
if (is_empty())
return false;
u32 last_code_point = 0;
for (auto it = code_points().begin(); it != code_points().end(); ++it)
last_code_point = *it;
return last_code_point == code_point;
}
bool String::ends_with_bytes(StringView bytes) const

8
AK/String.h
View file

@ -111,11 +111,11 @@ public:
// Compare this String against another string with caseless matching. Using this method requires linking LibUnicode into your application.
ErrorOr<bool> equals_ignoring_case(String const&) const;
bool starts_with(u32 code_point) const;
bool starts_with_bytes(StringView) const;
[[nodiscard]] bool starts_with(u32 code_point) const;
[[nodiscard]] bool starts_with_bytes(StringView) const;
bool ends_with(u32 code_point) const;
bool ends_with_bytes(StringView) const;
[[nodiscard]] bool ends_with(u32 code_point) const;
[[nodiscard]] bool ends_with_bytes(StringView) const;
// Creates a substring with a deep copy of the specified data window.
ErrorOr<String> substring_from_byte_offset(size_t start, size_t byte_count) const;