RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:07:34 +00:00
Code Issues Activity Actions

LibJS: Replace Vector<u16> usage in PrimitiveString wth Utf16String

Browse source 
This commit does not go out of its way to reduce copying of the string
data yet, but is a minimum set of changes to compile LibJS after making
PrimitiveString hold a Utf16String.
This commit is contained in:
Timothy Flynn 2021-08-09 09:06:45 -04:00 • committed by Andreas Kling
parent 02e7dceb96
commit c1e99fca1a
11 changed files with 80 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Userland/Libraries/LibJS/Runtime/PrimitiveString.cpp
View file

@ -17,7 +17,7 @@ PrimitiveString::PrimitiveString(String string)
{
}
PrimitiveString::PrimitiveString(Vector<u16> string)
PrimitiveString::PrimitiveString(Utf16String string)
: m_utf16_string(move(string))
, m_has_utf16_string(true)
{
@ -30,16 +30,16 @@ PrimitiveString::~PrimitiveString()
String const& PrimitiveString::string() const
{
if (!m_has_utf8_string) {
m_utf8_string = utf16_string_view().to_utf8(Utf16View::AllowInvalidCodeUnits::Yes);
m_utf8_string = m_utf16_string.to_utf8();
m_has_utf8_string = true;
}
return m_utf8_string;
}
Vector<u16> const& PrimitiveString::utf16_string() const
Utf16String const& PrimitiveString::utf16_string() const
{
if (!m_has_utf16_string) {
m_utf16_string = AK::utf8_to_utf16(m_utf8_string);
m_utf16_string = Utf16String(m_utf8_string);
m_has_utf16_string = true;
}
return m_utf16_string;
@ -47,24 +47,12 @@ Vector<u16> const& PrimitiveString::utf16_string() const
Utf16View PrimitiveString::utf16_string_view() const
{
return Utf16View { utf16_string() };
return utf16_string().view();
}
PrimitiveString* js_string(Heap& heap, Utf16View const& view)
{
if (view.is_empty())
return &heap.vm().empty_string();
if (view.length_in_code_units() == 1) {
u16 code_unit = view.code_unit_at(0);
if (is_ascii(code_unit))
return &heap.vm().single_ascii_character_string(static_cast<u8>(code_unit));
}
Vector<u16> string;
string.ensure_capacity(view.length_in_code_units());
string.append(view.data(), view.length_in_code_units());
return js_string(heap, move(string));
return js_string(heap, Utf16String(view));
}
PrimitiveString* js_string(VM& vm, Utf16View const& view)
@ -72,13 +60,13 @@ PrimitiveString* js_string(VM& vm, Utf16View const& view)
return js_string(vm.heap(), view);
}
PrimitiveString* js_string(Heap& heap, Vector<u16> string)
PrimitiveString* js_string(Heap& heap, Utf16String string)
{
if (string.is_empty())
return &heap.vm().empty_string();
if (string.size() == 1) {
u16 code_unit = string.at(0);
if (string.length_in_code_units() == 1) {
u16 code_unit = string.code_unit_at(0);
if (is_ascii(code_unit))
return &heap.vm().single_ascii_character_string(static_cast<u8>(code_unit));
}
@ -86,7 +74,7 @@ PrimitiveString* js_string(Heap& heap, Vector<u16> string)
return heap.allocate_without_global_object<PrimitiveString>(move(string));
}
PrimitiveString* js_string(VM& vm, Vector<u16> string)
PrimitiveString* js_string(VM& vm, Utf16String string)
{
return js_string(vm.heap(), move(string));
}