From e34cadf6e7abfef1d98cf3974ccd9872a79ccfbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20O=2E=20Sel=C3=A5sdal?= <nos@utel.tech>
Date: Thu, 10 Sep 2026 13:11:41 +0200
Subject: [PATCH 1/2] Reorganize files to base/ folder

---
 src/{ => base}/arena.c              | 0
 src/{ => base}/arena.h              | 0
 src/{base_core.h => base/core.h}    | 0
 src/{mini_arena.h => base/marena.h} | 0
 src/{ => base}/platform.c           | 0
 src/{ => base}/platform.h           | 0
 src/{ => base}/pool.c               | 0
 src/{ => base}/pool.h               | 0
 src/{ => base}/string.c             | 0
 src/{ => base}/string.h             | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename src/{ => base}/arena.c (100%)
 rename src/{ => base}/arena.h (100%)
 rename src/{base_core.h => base/core.h} (100%)
 rename src/{mini_arena.h => base/marena.h} (100%)
 rename src/{ => base}/platform.c (100%)
 rename src/{ => base}/platform.h (100%)
 rename src/{ => base}/pool.c (100%)
 rename src/{ => base}/pool.h (100%)
 rename src/{ => base}/string.c (100%)
 rename src/{ => base}/string.h (100%)

diff --git a/src/arena.c b/src/base/arena.c
similarity index 100%
rename from src/arena.c
rename to src/base/arena.c
diff --git a/src/arena.h b/src/base/arena.h
similarity index 100%
rename from src/arena.h
rename to src/base/arena.h
diff --git a/src/base_core.h b/src/base/core.h
similarity index 100%
rename from src/base_core.h
rename to src/base/core.h
diff --git a/src/mini_arena.h b/src/base/marena.h
similarity index 100%
rename from src/mini_arena.h
rename to src/base/marena.h
diff --git a/src/platform.c b/src/base/platform.c
similarity index 100%
rename from src/platform.c
rename to src/base/platform.c
diff --git a/src/platform.h b/src/base/platform.h
similarity index 100%
rename from src/platform.h
rename to src/base/platform.h
diff --git a/src/pool.c b/src/base/pool.c
similarity index 100%
rename from src/pool.c
rename to src/base/pool.c
diff --git a/src/pool.h b/src/base/pool.h
similarity index 100%
rename from src/pool.h
rename to src/base/pool.h
diff --git a/src/string.c b/src/base/string.c
similarity index 100%
rename from src/string.c
rename to src/base/string.c
diff --git a/src/string.h b/src/base/string.h
similarity index 100%
rename from src/string.h
rename to src/base/string.h
-- 
2.54.0


From 075b049894b2ffb0480c63475fe0e7a4948ec0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20O=2E=20Sel=C3=A5sdal?= <nos@utel.tech>
Date: Thu, 10 Sep 2026 13:13:24 +0200
Subject: [PATCH 2/2] Missing commit

---
 build.sh            |  2 +-
 src/base/arena.c    |  2 +-
 src/base/arena.h    |  2 +-
 src/base/marena.h   |  2 +-
 src/base/platform.c |  2 +-
 src/base/platform.h |  2 +-
 src/base/pool.h     |  2 +-
 src/base/string.h   |  2 +-
 src/main.c          | 12 ++++++------
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build.sh b/build.sh
index f89c522..b93fadd 100755
--- a/build.sh
+++ b/build.sh
@@ -2,4 +2,4 @@
 CFLAGS=${CFLAGS:-"-fsanitize=address -ggdb"}
 CC=${CC:-gcc}
 set -x
-${CC} -DDEBUG -pipe  -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -std=gnu2x $CFLAGS src/*c
+${CC} -DDEBUG -pipe  -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -std=gnu2x $CFLAGS src/*c src/base/*c
diff --git a/src/base/arena.c b/src/base/arena.c
index 8b7a1a9..6c221fd 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -1,5 +1,5 @@
 #include "arena.h"
-#include "base_core.h"
+#include "core.h"
 #include "platform.h"
 
 
diff --git a/src/base/arena.h b/src/base/arena.h
index 49d699d..0147dd4 100644
--- a/src/base/arena.h
+++ b/src/base/arena.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "base_core.h"
+#include "core.h"
 
 
 typedef U32 ArenaFlags;
diff --git a/src/base/marena.h b/src/base/marena.h
index 47cf0f3..c356194 100644
--- a/src/base/marena.h
+++ b/src/base/marena.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "base_core.h"
+#include "core.h"
 
 // Mini Arena for arena allocations from a supplied buffer
 
diff --git a/src/base/platform.c b/src/base/platform.c
index 9f50b9e..fa5a2b7 100644
--- a/src/base/platform.c
+++ b/src/base/platform.c
@@ -1,4 +1,4 @@
-#include "base_core.h"
+#include "core.h"
 #include "platform.h"
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/base/platform.h b/src/base/platform.h
index f7932dd..6526d85 100644
--- a/src/base/platform.h
+++ b/src/base/platform.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <stdlib.h>
-#include "base_core.h"
+#include "core.h"
 
 void *platform_malloc(size_t size);
 void platform_free(void *mem);
diff --git a/src/base/pool.h b/src/base/pool.h
index 79bf65a..d21dc1f 100644
--- a/src/base/pool.h
+++ b/src/base/pool.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "base_core.h"
+#include "core.h"
 
 typedef union APoolElement APoolElement;
 union APoolElement {
diff --git a/src/base/string.h b/src/base/string.h
index 1bcfad7..a7ee836 100644
--- a/src/base/string.h
+++ b/src/base/string.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "base_core.h"
+#include "core.h"
 
 typedef struct Str Str;
 struct Str {
diff --git a/src/main.c b/src/main.c
index 14fc202..c785523 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,9 +1,9 @@
-#include "base_core.h"
-#include "arena.h"
-#include "mini_arena.h"
-#include "platform.h"
-#include "pool.h"
-#include "string.h"
+#include "base/core.h"
+#include "base/arena.h"
+#include "base/marena.h"
+#include "base/platform.h"
+#include "base/pool.h"
+#include "base/string.h"
 #include <stdio.h>
 #include <stdlib.h>
 
-- 
2.54.0