beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

AK+LibIPC: Add a convenience encoder/decoder for JsonValue

Browse source 
This requires that JsonValue is implicitly default-constructible.
This commit is contained in:
Timothy Flynn 2022-11-07 16:30:55 -05:00 committed by Tim Flynn
parent 08750f69e4
commit 3994a79718
Notes: sideshowbarker 2024-07-17 08:59:18 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/3994a79718
Pull-request: https://github.com/SerenityOS/serenity/pull/15981
Reviewed-by: https://github.com/linusg ✅
5 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AK/JsonValue.h
View file

@ -35,7 +35,8 @@ public:
static ErrorOr<JsonValue> from_string(StringView);
explicit JsonValue(Type = Type::Null);
JsonValue() = default;
explicit JsonValue(Type);
~JsonValue() { clear(); }
JsonValue(JsonValue const&);

9
Userland/Libraries/LibIPC/Decoder.cpp
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/JsonValue.h>
#include <AK/MemoryStream.h>
#include <AK/URL.h>
#include <LibCore/AnonymousBuffer.h>
@ -128,6 +129,14 @@ ErrorOr<void> Decoder::decode(ByteBuffer& value)
return m_stream.try_handle_any_error();
}
ErrorOr<void> Decoder::decode(JsonValue& value)
{
String string;
TRY(decode(string));
value = TRY(JsonValue::from_string(string));
return {};
}
ErrorOr<void> Decoder::decode(URL& value)
{
String string;

1
Userland/Libraries/LibIPC/Decoder.h
View file

@ -49,6 +49,7 @@ public:
ErrorOr<void> decode(double&);
ErrorOr<void> decode(String&);
ErrorOr<void> decode(ByteBuffer&);
ErrorOr<void> decode(JsonValue&);
ErrorOr<void> decode(URL&);
ErrorOr<void> decode(Dictionary&);
ErrorOr<void> decode(File&);

8
Userland/Libraries/LibIPC/Encoder.cpp
View file

@ -7,6 +7,8 @@
#include <AK/BitCast.h>
#include <AK/ByteBuffer.h>
#include <AK/JsonObject.h>
#include <AK/JsonValue.h>
#include <AK/String.h>
#include <AK/URL.h>
#include <LibCore/AnonymousBuffer.h>
@ -159,6 +161,12 @@ Encoder& Encoder::operator<<(ByteBuffer const& value)
return *this;
}
Encoder& Encoder::operator<<(JsonValue const& value)
{
*this << value.serialized<StringBuilder>();
return *this;
}
Encoder& Encoder::operator<<(URL const& value)
{
return *this << value.to_string();

1
Userland/Libraries/LibIPC/Encoder.h
View file

@ -45,6 +45,7 @@ public:
Encoder& operator<<(StringView);
Encoder& operator<<(String const&);
Encoder& operator<<(ByteBuffer const&);
Encoder& operator<<(JsonValue const&);
Encoder& operator<<(URL const&);
Encoder& operator<<(Dictionary const&);
Encoder& operator<<(File const&);