wash/bluelib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meta: rename legacy object module to 'ds'

Browse Source
This commit is contained in:
max 🍓
2025-08-09 19:57:42 +01:00
parent a5e3e06306
commit 0751ef469f
80 changed files with 460 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
serial/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
include(../cmake/Templates.cmake)
add_bluelib_module(NAME serial DEPENDENCIES core object)
add_bluelib_module(NAME serial DEPENDENCIES core ds)

6
serial/include/blue/serial.h
View File

@@ -5,7 +5,7 @@
#include <blue/core/status.h>
#include <blue/core/stream.h>
struct b_object;
struct b_dsref;
typedef enum b_serial_format {
B_SERIAL_FORMAT_NONE = 0,
@@ -24,11 +24,11 @@ BLUE_API b_status b_serial_ctx_create(b_serial_ctx **out);
BLUE_API b_status b_serial_ctx_destroy(b_serial_ctx *ctx);
BLUE_API b_status b_serial_ctx_serialise(
b_serial_ctx *ctx, b_serial_format fmt, struct b_object *src,
b_serial_ctx *ctx, b_serial_format fmt, struct b_dsref *src,
b_stream *dest, b_serial_flags flags);
BLUE_API b_status b_serial_ctx_deserialise(
b_serial_ctx *ctx, b_serial_format fmt, b_stream *src,
struct b_object **dest, b_serial_flags flags);
struct b_dsref **dest, b_serial_flags flags);
#endif

84
serial/json.c
View File

@@ -37,12 +37,12 @@
#pragma warning(disable : 4001)
#endif
#include <blue/object/array.h>
#include <blue/object/dict.h>
#include <blue/object/number.h>
#include <blue/object/object.h>
#include <blue/object/string.h>
#include <blue/object/uuid.h>
#include <blue/ds/array.h>
#include <blue/ds/dict.h>
#include <blue/ds/number.h>
#include <blue/ds/object.h>
#include <blue/ds/string.h>
#include <blue/ds/uuid.h>
#include <ctype.h>
#include <float.h>
#include <limits.h>
@@ -2933,9 +2933,9 @@ CJSON_PUBLIC(void) cJSON_free(void *object)
object = NULL;
}
static enum b_status b_object_to_cJSON(const struct b_object *object, cJSON **out);
static enum b_status b_dsref_to_cJSON(const struct b_dsref *object, cJSON **out);
static enum b_status serialise_array(const struct b_object *object, cJSON **out)
static enum b_status serialise_array(const struct b_dsref *object, cJSON **out)
{
cJSON *json_array = cJSON_CreateArray();
if (!json_array) {
@@ -2947,7 +2947,7 @@ static enum b_status serialise_array(const struct b_object *object, cJSON **out)
b_array_foreach(&it, array)
{
cJSON *child = NULL;
enum b_status status = b_object_to_cJSON(it.value, &child);
enum b_status status = b_dsref_to_cJSON(it.value, &child);
if (!B_OK(status)) {
cJSON_Delete(json_array);
return status;
@@ -2960,7 +2960,7 @@ static enum b_status serialise_array(const struct b_object *object, cJSON **out)
return B_SUCCESS;
}
static enum b_status serialise_dict(const struct b_object *object, cJSON **out)
static enum b_status serialise_dict(const struct b_dsref *object, cJSON **out)
{
cJSON *json_dict = cJSON_CreateObject();
if (!json_dict) {
@@ -2972,7 +2972,7 @@ static enum b_status serialise_dict(const struct b_object *object, cJSON **out)
b_dict_foreach(&it, dict)
{
cJSON *child = NULL;
enum b_status status = b_object_to_cJSON(it.value, &child);
enum b_status status = b_dsref_to_cJSON(it.value, &child);
if (!B_OK(status)) {
cJSON_Delete(json_dict);
return status;
@@ -2985,7 +2985,7 @@ static enum b_status serialise_dict(const struct b_object *object, cJSON **out)
return B_SUCCESS;
}
static enum b_status serialise_number(const struct b_object *object, cJSON **out)
static enum b_status serialise_number(const struct b_dsref *object, cJSON **out)
{
cJSON *json_number = cJSON_CreateNumber(0);
if (!json_number) {
@@ -3049,7 +3049,7 @@ static enum b_status serialise_number(const struct b_object *object, cJSON **out
return B_SUCCESS;
}
static enum b_status serialise_string(const struct b_object *object, cJSON **out)
static enum b_status serialise_string(const struct b_dsref *object, cJSON **out)
{
struct b_string *string = B_STRING(object);
cJSON *json_string = cJSON_CreateStringReference(b_string_ptr(string));
@@ -3061,7 +3061,7 @@ static enum b_status serialise_string(const struct b_object *object, cJSON **out
return B_SUCCESS;
}
static enum b_status serialise_uuid(const struct b_object *object, cJSON **out)
static enum b_status serialise_uuid(const struct b_dsref *object, cJSON **out)
{
struct b_uuid *uuid = B_UUID(object);
char s[B_UUID_STRING_MAX];
@@ -3077,21 +3077,21 @@ static enum b_status serialise_uuid(const struct b_object *object, cJSON **out)
}
typedef enum b_status (*object_serialise_callback)(
const struct b_object *, cJSON **);
const struct b_dsref *, cJSON **);
static const object_serialise_callback object_serialise[] = {
[B_OBJECT_TYPE_ARRAY] = serialise_array,
[B_OBJECT_TYPE_DICT] = serialise_dict,
[B_OBJECT_TYPE_NUMBER] = serialise_number,
[B_OBJECT_TYPE_STRING] = serialise_string,
[B_OBJECT_TYPE_UUID] = serialise_uuid,
[B_DSREF_TYPE_ARRAY] = serialise_array,
[B_DSREF_TYPE_DICT] = serialise_dict,
[B_DSREF_TYPE_NUMBER] = serialise_number,
[B_DSREF_TYPE_STRING] = serialise_string,
[B_DSREF_TYPE_UUID] = serialise_uuid,
};
static const size_t nr_object_serialise
= sizeof object_serialise / sizeof object_serialise[0];
static enum b_status b_object_to_cJSON(const struct b_object *object, cJSON **out)
static enum b_status b_dsref_to_cJSON(const struct b_dsref *object, cJSON **out)
{
b_object_type_id type = b_typeid(object);
b_dsref_type_id type = b_typeid(object);
if (type >= nr_object_serialise) {
return B_ERR_NOT_SUPPORTED;
}
@@ -3104,9 +3104,9 @@ static enum b_status b_object_to_cJSON(const struct b_object *object, cJSON **ou
return callback(object, out);
}
static enum b_status cJSON_to_b_object(cJSON *json, struct b_object **out);
static enum b_status cJSON_to_b_dsref(cJSON *json, struct b_dsref **out);
static enum b_status deserialise_dict(cJSON *json, struct b_object **out)
static enum b_status deserialise_dict(cJSON *json, struct b_dsref **out)
{
struct b_dict *dict = b_dict_create();
if (!dict) {
@@ -3117,8 +3117,8 @@ static enum b_status deserialise_dict(cJSON *json, struct b_object **out)
enum b_status status = B_SUCCESS;
while (item) {
struct b_object *child = NULL;
status = cJSON_to_b_object(item, &child);
struct b_dsref *child = NULL;
status = cJSON_to_b_dsref(item, &child);
if (!B_OK(status)) {
b_dict_release(dict);
dict = NULL;
@@ -3133,11 +3133,11 @@ static enum b_status deserialise_dict(cJSON *json, struct b_object **out)
item = item->next;
}
*out = B_OBJECT(dict);
*out = B_DSREF(dict);
return B_SUCCESS;
}
static enum b_status deserialise_array(cJSON *json, struct b_object **out)
static enum b_status deserialise_array(cJSON *json, struct b_dsref **out)
{
struct b_array *array = b_array_create();
if (!array) {
@@ -3148,8 +3148,8 @@ static enum b_status deserialise_array(cJSON *json, struct b_object **out)
enum b_status status = B_SUCCESS;
while (item) {
struct b_object *child = NULL;
status = cJSON_to_b_object(item, &child);
struct b_dsref *child = NULL;
status = cJSON_to_b_dsref(item, &child);
if (!B_OK(status)) {
b_array_release(array);
array = NULL;
@@ -3164,22 +3164,22 @@ static enum b_status deserialise_array(cJSON *json, struct b_object **out)
item = item->next;
}
*out = B_OBJECT(array);
*out = B_DSREF(array);
return B_SUCCESS;
}
static enum b_status deserialise_string(cJSON *json, struct b_object **out)
static enum b_status deserialise_string(cJSON *json, struct b_dsref **out)
{
struct b_string *string = b_string_create_from_cstr(json->valuestring);
if (!string) {
return B_ERR_NO_MEMORY;
}
*out = B_OBJECT(string);
*out = B_DSREF(string);
return B_SUCCESS;
}
static enum b_status deserialise_number(cJSON *json, struct b_object **out)
static enum b_status deserialise_number(cJSON *json, struct b_dsref **out)
{
struct b_number *number = NULL;
@@ -3193,11 +3193,11 @@ static enum b_status deserialise_number(cJSON *json, struct b_object **out)
return B_ERR_NO_MEMORY;
}
*out = B_OBJECT(number);
*out = B_DSREF(number);
return B_SUCCESS;
}
static enum b_status deserialise_bool(cJSON *json, struct b_object **out)
static enum b_status deserialise_bool(cJSON *json, struct b_dsref **out)
{
struct b_number *number = NULL;
@@ -3211,11 +3211,11 @@ static enum b_status deserialise_bool(cJSON *json, struct b_object **out)
return B_ERR_NO_MEMORY;
}
*out = B_OBJECT(number);
*out = B_DSREF(number);
return B_SUCCESS;
}
static enum b_status cJSON_to_b_object(cJSON *json, struct b_object **out)
static enum b_status cJSON_to_b_dsref(cJSON *json, struct b_dsref **out)
{
switch (json->type) {
case cJSON_True:
@@ -3238,11 +3238,11 @@ static enum b_status cJSON_to_b_object(cJSON *json, struct b_object **out)
}
static enum b_status json_serialise(
struct b_serial_ctx *ctx, struct b_object *src, struct b_stream *dest,
struct b_serial_ctx *ctx, struct b_dsref *src, struct b_stream *dest,
enum b_serial_flags flags)
{
cJSON *json;
enum b_status status = b_object_to_cJSON(src, &json);
enum b_status status = b_dsref_to_cJSON(src, &json);
if (!B_OK(status)) {
return status;
@@ -3269,7 +3269,7 @@ static enum b_status json_serialise(
}
static enum b_status json_deserialise(
struct b_serial_ctx *ctx, struct b_stream *src, struct b_object **dest,
struct b_serial_ctx *ctx, struct b_stream *src, struct b_dsref **dest,
enum b_serial_flags flags)
{
struct b_string *json_string = b_string_create();
@@ -3294,7 +3294,7 @@ static enum b_status json_deserialise(
return B_ERR_BAD_FORMAT;
}
status = cJSON_to_b_object(json, dest);
status = cJSON_to_b_dsref(json, dest);
cJSON_Delete(json);

4
serial/serial.c
View File

@@ -51,7 +51,7 @@ static const struct b_serial_format_ops *get_formatter(enum b_serial_format fmt)
enum b_status b_serial_ctx_serialise(
struct b_serial_ctx *ctx, enum b_serial_format fmt,
struct b_object *src, struct b_stream *dest, enum b_serial_flags flags)
struct b_dsref *src, struct b_stream *dest, enum b_serial_flags flags)
{
const struct b_serial_format_ops *ops = get_formatter(fmt);
if (!ops) {
@@ -67,7 +67,7 @@ enum b_status b_serial_ctx_serialise(
enum b_status b_serial_ctx_deserialise(
struct b_serial_ctx *ctx, enum b_serial_format fmt,
struct b_stream *src, struct b_object **dest, enum b_serial_flags flags)
struct b_stream *src, struct b_dsref **dest, enum b_serial_flags flags)
{
const struct b_serial_format_ops *ops = get_formatter(fmt);
if (!ops) {

4
serial/serial.h
View File

@@ -10,10 +10,10 @@ struct b_serial_ctx {
struct b_serial_format_ops {
enum b_status (*fmt_serialise)(
struct b_serial_ctx *, struct b_object *, struct b_stream *,
struct b_serial_ctx *, struct b_dsref *, struct b_stream *,
enum b_serial_flags);
enum b_status (*fmt_deserialise)(
struct b_serial_ctx *, struct b_stream *, struct b_object **,
struct b_serial_ctx *, struct b_stream *, struct b_dsref **,
enum b_serial_flags);
};