RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:48:12 +00:00
Code Issues Activity Actions

AK: Make String const-correct internally

Browse source
This commit is contained in:
Andreas Kling 2023-02-19 23:00:24 +01:00
parent a56dfd5c77
commit e08c55dd8d
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
AK/String.cpp
View file

@ -63,7 +63,7 @@ public:
} }
bool is_fly_string() const { return m_is_fly_string; } bool is_fly_string() const { return m_is_fly_string; }
void set_fly_string(bool is_fly_string) { m_is_fly_string = is_fly_string; } void set_fly_string(bool is_fly_string) const { m_is_fly_string = is_fly_string; }
private: private:
explicit StringData(size_t byte_count); explicit StringData(size_t byte_count);
@ -75,7 +75,7 @@ private:
mutable unsigned m_hash { 0 }; mutable unsigned m_hash { 0 };
mutable bool m_has_hash { false }; mutable bool m_has_hash { false };
bool m_substring { false }; bool m_substring { false };
bool m_is_fly_string { false }; mutable bool m_is_fly_string { false };
alignas(SubstringData) u8 m_bytes_or_substring_data[0]; alignas(SubstringData) u8 m_bytes_or_substring_data[0];
}; };
@ -165,7 +165,7 @@ void StringData::compute_hash() const
} }
String::String(NonnullRefPtr<Detail::StringData> data) String::String(NonnullRefPtr<Detail::StringData const> data)
: m_data(&data.leak_ref()) : m_data(&data.leak_ref())
{ {
} }
@ -485,7 +485,7 @@ String String::fly_string_data_to_string(Badge<FlyString>, uintptr_t const& data
return String { *reinterpret_cast<ShortString const*>(&data) }; return String { *reinterpret_cast<ShortString const*>(&data) };
auto const* string_data = reinterpret_cast<Detail::StringData const*>(data); auto const* string_data = reinterpret_cast<Detail::StringData const*>(data);
return String { NonnullRefPtr<Detail::StringData>(*string_data) }; return String { NonnullRefPtr<Detail::StringData const>(*string_data) };
} }
StringView String::fly_string_data_to_string_view(Badge<FlyString>, uintptr_t const& data) StringView String::fly_string_data_to_string_view(Badge<FlyString>, uintptr_t const& data)

4
AK/String.h
View file

@ -230,7 +230,7 @@ private:
u8 storage[MAX_SHORT_STRING_BYTE_COUNT] = { 0 }; u8 storage[MAX_SHORT_STRING_BYTE_COUNT] = { 0 };
}; };
explicit String(NonnullRefPtr<Detail::StringData>); explicit String(NonnullRefPtr<Detail::StringData const>);
explicit constexpr String(ShortString short_string) explicit constexpr String(ShortString short_string)
: m_short_string(short_string) : m_short_string(short_string)
@ -241,7 +241,7 @@ private:
union { union {
ShortString m_short_string; ShortString m_short_string;
Detail::StringData* m_data { nullptr }; Detail::StringData const* m_data { nullptr };
}; };
}; };