RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 08:24:58 +00:00
Code Issues Activity Actions

AK: Add String::from_stream method

Browse source 
The caller is responsible for determining how long the string is that
they want to read.
This commit is contained in:
Andrew Kaster 2023-02-19 18:34:29 -07:00 • committed by Linus Groh
parent 7ac7a73758
commit 0ea697ace5
3 changed files with 84 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
AK/String.cpp
View file

@ -9,6 +9,7 @@
#include <AK/FlyString.h>
#include <AK/Format.h>
#include <AK/MemMem.h>
#include <AK/Stream.h>
#include <AK/String.h>
#include <AK/Utf8View.h>
#include <AK/Vector.h>
@ -23,6 +24,7 @@ public:
static ErrorOr<NonnullRefPtr<StringData>> create_uninitialized(size_t, u8*& buffer);
static ErrorOr<NonnullRefPtr<StringData>> create_substring(StringData const& superstring, size_t start, size_t byte_count);
static ErrorOr<NonnullRefPtr<StringData>> from_utf8(char const* utf8_bytes, size_t);
static ErrorOr<NonnullRefPtr<StringData>> from_stream(Stream&, size_t byte_count);
struct SubstringData {
StringData const* superstring { nullptr };
@ -141,6 +143,23 @@ ErrorOr<NonnullRefPtr<StringData>> StringData::from_utf8(char const* utf8_data,
return new_string_data;
}
ErrorOr<NonnullRefPtr<StringData>> StringData::from_stream(Stream& stream, size_t byte_count)
{
// Strings of MAX_SHORT_STRING_BYTE_COUNT bytes or less should be handled by the String short string optimization.
VERIFY(byte_count > String::MAX_SHORT_STRING_BYTE_COUNT);
u8* buffer = nullptr;
auto new_string_data = TRY(create_uninitialized(byte_count, buffer));
Bytes new_string_bytes = { buffer, byte_count };
TRY(stream.read(new_string_bytes));
Utf8View view(StringView { new_string_bytes });
if (!view.validate())
return Error::from_string_literal("StringData::from_stream: Input was not valid UTF-8");
return new_string_data;
}
ErrorOr<NonnullRefPtr<StringData>> StringData::create_substring(StringData const& superstring, size_t start, size_t byte_count)
{
// Strings of MAX_SHORT_STRING_BYTE_COUNT bytes or less should be handled by the String short string optimization.
@ -222,6 +241,19 @@ ErrorOr<String> String::from_utf8(StringView view)
return String { move(data) };
}
ErrorOr<String> String::from_stream(Stream& stream, size_t byte_count)
{
if (byte_count <= MAX_SHORT_STRING_BYTE_COUNT) {
ShortString short_string;
if (byte_count > 0)
TRY(stream.read({ short_string.storage, byte_count }));
short_string.byte_count_and_short_string_flag = (byte_count << 1) | SHORT_STRING_FLAG;
return String { short_string };
}
auto data = TRY(Detail::StringData::from_stream(stream, byte_count));
return String { move(data) };
}
ErrorOr<String> String::repeated(u32 code_point, size_t count)
{
VERIFY(is_unicode(code_point));