From 65a756da48942f4052ad2c8f515b82115f7870ff Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 20 Nov 2022 16:32:46 +0100
Subject: [PATCH] refactor: moved dynarray back to package model

---
 src/{util => package}/c/dynarray.c | 0
 src/{util => package}/c/dynarray.h | 0
 src/package/package.c.v            | 1 +
 src/util/util.c.v                  | 7 -------
 src/util/v.mod                     | 3 ---
 5 files changed, 1 insertion(+), 10 deletions(-)
 rename src/{util => package}/c/dynarray.c (100%)
 rename src/{util => package}/c/dynarray.h (100%)
 delete mode 100644 src/util/util.c.v
 delete mode 100644 src/util/v.mod

diff --git a/src/util/c/dynarray.c b/src/package/c/dynarray.c
similarity index 100%
rename from src/util/c/dynarray.c
rename to src/package/c/dynarray.c
diff --git a/src/util/c/dynarray.h b/src/package/c/dynarray.h
similarity index 100%
rename from src/util/c/dynarray.h
rename to src/package/c/dynarray.h
diff --git a/src/package/package.c.v b/src/package/package.c.v
index a9c4784..25272f8 100644
--- a/src/package/package.c.v
+++ b/src/package/package.c.v
@@ -5,6 +5,7 @@ module package
 // We need to specify *every* C file here. Otherwise, Vieter doesn't compile.
 #flag @VMODROOT/c/package.o
 #flag @VMODROOT/c/package_info.o
+#flag @VMODROOT/c/dynarray.o
 
 #include "package.h"
 
diff --git a/src/util/util.c.v b/src/util/util.c.v
deleted file mode 100644
index 997a18d..0000000
--- a/src/util/util.c.v
+++ /dev/null
@@ -1,7 +0,0 @@
-module util
-
-#flag -I @VMODROOT/c
-
-// This makes the V compiler include this object file when linking, allowing
-// all other C parts of the codebase to use it as well.
-#flag @VMODROOT/c/dynarray.o
diff --git a/src/util/v.mod b/src/util/v.mod
deleted file mode 100644
index 39a57af..0000000
--- a/src/util/v.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-Module{
-    name: 'util'
-}