From 0c53974ac9ed28db431d71ad4f35d1fbc08eaca7 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Sun, 3 May 2026 16:48:42 +0100 Subject: [PATCH] fx.serial: convert to new assembly build system --- CMakeLists.txt | 10 ++++++- assemblies/fx.serial.c | 7 +++++ fx.serial/CMakeLists.txt | 4 +-- fx.serial/include/fx/serial/bitcode.h | 2 +- fx.serial/include/fx/serial/ctx.h | 10 +++---- fx.serial/include/fx/serial/toml.h | 2 +- fx.serial/toml.c | 42 +++++++++++++-------------- 7 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 assemblies/fx.serial.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 845cca2..b1d518c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,8 @@ set(fx_all_assemblies fx.runtime fx.collections fx.compression - fx.io) + fx.io + fx.serial) if (NOT DEFINED fx_assemblies) set(fx_assemblies ${fx_all_assemblies}) @@ -67,4 +68,11 @@ if ("fx.compression" IN_LIST fx_assemblies) DEPENDENCIES fx.runtime) endif () +if ("fx.serial" IN_LIST fx_assemblies) + add_fx_assembly( + NAME fx.serial + NAMESPACES fx.serial + DEPENDENCIES fx.runtime fx.collections) +endif () + add_executable(dynamic-test test/dynamic-test.c) diff --git a/assemblies/fx.serial.c b/assemblies/fx.serial.c new file mode 100644 index 0000000..8230f45 --- /dev/null +++ b/assemblies/fx.serial.c @@ -0,0 +1,7 @@ +#include +#include + +FX_ASSEMBLY_BEGIN() + FX_ASSEMBLY_NAME("fx.serial"); + FX_ASSEMBLY_VERSION(1, 0, 0, 0); +FX_ASSEMBLY_END() diff --git a/fx.serial/CMakeLists.txt b/fx.serial/CMakeLists.txt index fc16ee5..cd1d60e 100644 --- a/fx.serial/CMakeLists.txt +++ b/fx.serial/CMakeLists.txt @@ -1,3 +1 @@ -include(../cmake/Templates.cmake) - -add_fx_module(NAME serial DEPENDENCIES core ds) +export_fx_namespace_details(fx.serial) diff --git a/fx.serial/include/fx/serial/bitcode.h b/fx.serial/include/fx/serial/bitcode.h index 63eefa8..e2d412e 100644 --- a/fx.serial/include/fx/serial/bitcode.h +++ b/fx.serial/include/fx/serial/bitcode.h @@ -1,7 +1,7 @@ #ifndef FX_SERIAL_BITCODE_H_ #define FX_SERIAL_BITCODE_H_ -#include +#include FX_DECLS_BEGIN; diff --git a/fx.serial/include/fx/serial/ctx.h b/fx.serial/include/fx/serial/ctx.h index 166d262..c47db30 100644 --- a/fx.serial/include/fx/serial/ctx.h +++ b/fx.serial/include/fx/serial/ctx.h @@ -1,11 +1,11 @@ #ifndef FX_SERIAL_CTX_H_ #define FX_SERIAL_CTX_H_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include FX_DECLS_BEGIN; diff --git a/fx.serial/include/fx/serial/toml.h b/fx.serial/include/fx/serial/toml.h index 5c4ff4f..25bcae3 100644 --- a/fx.serial/include/fx/serial/toml.h +++ b/fx.serial/include/fx/serial/toml.h @@ -1,7 +1,7 @@ #ifndef FX_SERIAL_TOML_H_ #define FX_SERIAL_TOML_H_ -#include +#include FX_DECLS_BEGIN; diff --git a/fx.serial/toml.c b/fx.serial/toml.c index 479d083..26ca1e1 100644 --- a/fx.serial/toml.c +++ b/fx.serial/toml.c @@ -1,14 +1,14 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include #include #include #include @@ -1400,7 +1400,7 @@ static void read_newline(struct ctx *ctx) } enqueue_token(ctx, TOK_NEWLINE); - ctx->ctx_result = FX_SUCCESS; + ctx->ctx_result = FX_RESULT_SUCCESS; } static void read_comment(struct ctx *ctx) @@ -1670,7 +1670,7 @@ static fx_result parse_timestamp(struct ctx *ctx, fx_object **result) tok->tok_value.time = NULL; *result = (dt); - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static fx_result parse_string(struct ctx *ctx, fx_object **result) @@ -1682,7 +1682,7 @@ static fx_result parse_string(struct ctx *ctx, fx_object **result) } *result = (str); - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static fx_result parse_int(struct ctx *ctx, fx_object **result) @@ -1708,7 +1708,7 @@ static fx_result parse_int(struct ctx *ctx, fx_object **result) } *result = (val); - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static fx_result parse_float(struct ctx *ctx, fx_object **result) @@ -1734,7 +1734,7 @@ static fx_result parse_float(struct ctx *ctx, fx_object **result) } *result = (val); - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static fx_result parse_bool(struct ctx *ctx, fx_object **result) @@ -1746,7 +1746,7 @@ static fx_result parse_bool(struct ctx *ctx, fx_object **result) } *result = (val); - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static fx_result parse_table_inline(struct ctx *ctx, fx_object **result) @@ -1763,7 +1763,7 @@ static fx_result parse_table_inline(struct ctx *ctx, fx_object **result) struct token *tok = peek_token(ctx); if (tok && tok->tok_type == TOK_RIGHT_BRACE) { *result = (table); - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } bool done = false; @@ -1797,7 +1797,7 @@ static fx_result parse_table_inline(struct ctx *ctx, fx_object **result) } *result = (table); - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static void skip_newlines(struct ctx *ctx) @@ -1878,7 +1878,7 @@ static fx_result parse_array_inline(struct ctx *ctx, fx_object **result) DISABLE_EXTENDED_LEXING(ctx); *result = (array); - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static fx_result parse_value(struct ctx *ctx, fx_object **result) @@ -2005,7 +2005,7 @@ static fx_result parse_key_value_pair(struct ctx *ctx, fx_dict *container) ctx_set_object_flags(ctx, value, OBJECT_KV_END_DEFINED); } - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static fx_result parse_table_header( @@ -2101,7 +2101,7 @@ static fx_result parse_table_header( advance_token(ctx); *new_container = new_table; - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static fx_result parse_array_header( @@ -2183,7 +2183,7 @@ static fx_result parse_array_header( advance_token(ctx); *new_container = new_table; - return FX_SUCCESS; + return FX_RESULT_SUCCESS; } static fx_result parse_root(struct ctx *ctx, fx_dict **out)