Refactor strings and allocator to primitives

2025-05-04 23:25:27 +01:00
parent 163283f77f
commit f444911452
30 changed files with 51 additions and 272 deletions
--- a/src/core/os/shell/commander/commander.c
+++ b/src/core/os/shell/commander/commander.c
@@ -1,12 +1,12 @@
 #include "commander.h"
 #include "commander_output.h"
 #include "../utils/shell_utils.h"
-#include "../../../mem/allocator/mem_allocator.h"
 #include "../../../mem/arena/mem_arena_allocator.h"
-#include "../../../strings/str8/str8.h"
-#include "../../../../containers/dbl_list/dbl_list.h"
 #include "../../../../common/aliases/aliases.h"
 #include "../../../../common/misc/misc_utils.h"
+#include "../../../../primitives/dbl_list/dbl_list.h"
+#include "../../../../primitives/mem_allocator/mem_allocator.h"
+#include "../../../../primitives/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
--- a/src/core/os/shell/commander/commander.h
+++ b/src/core/os/shell/commander/commander.h
@@ -4,7 +4,7 @@
 #include "commander_output.h"
 #include "../../../../common/aliases/aliases.h"
 #include "../../../../common/platform/platform.h"
-#include "../../../strings/str8/str8.h"
+#include "../../../../primitives/strings/str8/str8.h"
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/src/core/os/shell/termcolour/posix/termcolour_posix.c
+++ b/src/core/os/shell/termcolour/posix/termcolour_posix.c
@@ -1,6 +1,6 @@
 #include "../../../../../common/aliases/aliases.h"
 #include "../../../../../common/platform/platform.h"
-#include "../../../../strings/str8/str8.h"
+#include "../../../../../primitives/strings/str8/str8.h"

 #ifdef WAPP_PLATFORM_POSIX

--- a/src/core/os/shell/termcolour/termcolour.c
+++ b/src/core/os/shell/termcolour/termcolour.c
@@ -1,6 +1,6 @@
 #include "termcolour.h"
 #include "terminal_colours.h"
-#include "../../../strings/str8/str8.h"
+#include "../../../../primitives/strings/str8/str8.h"

 void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour) {
  if (colour < WAPP_TERM_COLOUR_FG_BLACK || colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {
--- a/src/core/os/shell/termcolour/termcolour.h
+++ b/src/core/os/shell/termcolour/termcolour.h
@@ -4,7 +4,7 @@
 #include "terminal_colours.h"
 #include "../../../../common/aliases/aliases.h"
 #include "../../../../common/platform/platform.h"
-#include "../../../strings/str8/str8.h"
+#include "../../../../primitives/strings/str8/str8.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/core/os/shell/termcolour/win/termcolour_win.c
+++ b/src/core/os/shell/termcolour/win/termcolour_win.c
@@ -1,6 +1,6 @@
 #include "../../../../../common/aliases/aliases.h"
 #include "../../../../../common/platform/platform.h"
-#include "../../../../strings/str8/str8.h"
+#include "../../../../../primitives/strings/str8/str8.h"

 #ifdef WAPP_PLATFORM_WINDOWS