Remove core subfolders

CMakeLists.txt

@@ -8,7 +8,6 @@ set(SRC
     "src/Logger.c"
     "src/Random.c"
     "src/Utility.c"
-    #"src/ArrayString.cpp"
     #"src/BitArray.cpp"
     #"src/Box.cpp"
     #"src/Clock.cpp"
@@ -31,7 +30,6 @@ set(SRC_TESTS
     "test/modules/RandomTests.c"
     "test/modules/UtilityTests.c"
     #"test/modules/ArrayListTests.cpp"
-    #"test/modules/ArrayStringTests.cpp"
     #"test/modules/ArrayTests.cpp"
     #"test/modules/BitArrayTests.cpp"
     #"test/modules/BoxTests.cpp"
@@ -42,7 +40,6 @@ set(SRC_TESTS
     #"test/modules/FileReaderTests.cpp"
     #"test/modules/FrustumTests.cpp"
     #"test/modules/HashMapTests.cpp"
-    #"test/modules/HashedStringTests.cpp"
     #"test/modules/LinkedListTests.cpp"
     #"test/modules/ListTests.cpp"
     #"test/modules/MathTests.cpp"
@@ -168,40 +165,38 @@ target_sources(core PUBLIC
     FILE_SET HEADERS
     BASE_DIRS include
     FILES 
-        ./include/core/utils/Buffer.h
-        ./include/core/utils/Check.h
-        ./include/core/utils/Error.h
-        ./include/core/utils/Logger.h
-        ./include/core/utils/Random.h
-        ./include/core/utils/Types.h
-        ./include/core/utils/Utility.h
-#        ./include/core/data/Array.hpp
-#        ./include/core/data/ArrayList.hpp
-#        ./include/core/data/BitArray.hpp
-#        ./include/core/data/Components.hpp
-#        ./include/core/data/HashMap.hpp
-#        ./include/core/data/LinkedList.hpp
-#        ./include/core/data/List.hpp
-#        ./include/core/data/ProbingHashMap.hpp
-#        ./include/core/data/RingBuffer.hpp
-#        ./include/core/data/Stack.hpp
-#        ./include/core/io/File.hpp
-#        ./include/core/io/FileReader.hpp
-#        ./include/core/math/Box.hpp
-#        ./include/core/math/BufferedValue.hpp
-#        ./include/core/math/Frustum.hpp
-#        ./include/core/math/Math.hpp
-#        ./include/core/math/Matrix.hpp
-#        ./include/core/math/MatrixStack.hpp
-#        ./include/core/math/Plane.hpp
-#        ./include/core/math/Quaternion.hpp
-#        ./include/core/math/Vector.hpp
-#        ./include/core/math/View.hpp
-#        ./include/core/thread/Thread.hpp
-#        ./include/core/utils/ArrayString.hpp
-#        ./include/core/utils/Clock.hpp
-#        ./include/core/utils/Color.hpp
-#        ./include/core/utils/HashCode.hpp
+        ./include/core/Buffer.h
+        ./include/core/Check.h
+        ./include/core/Error.h
+        ./include/core/Logger.h
+        ./include/core/Random.h
+        ./include/core/Types.h
+        ./include/core/Utility.h
+#        ./include/core/Array.hpp
+#        ./include/core/ArrayList.hpp
+#        ./include/core/BitArray.hpp
+#        ./include/core/Components.hpp
+#        ./include/core/HashMap.hpp
+#        ./include/core/LinkedList.hpp
+#        ./include/core/List.hpp
+#        ./include/core/ProbingHashMap.hpp
+#        ./include/core/RingBuffer.hpp
+#        ./include/core/Stack.hpp
+#        ./include/core/File.hpp
+#        ./include/core/FileReader.hpp
+#        ./include/core/Box.hpp
+#        ./include/core/BufferedValue.hpp
+#        ./include/core/Frustum.hpp
+#        ./include/core/Math.hpp
+#        ./include/core/Matrix.hpp
+#        ./include/core/MatrixStack.hpp
+#        ./include/core/Plane.hpp
+#        ./include/core/Quaternion.hpp
+#        ./include/core/Vector.hpp
+#        ./include/core/View.hpp
+#        ./include/core/Thread.hpp
+#        ./include/core/Clock.hpp
+#        ./include/core/Color.hpp
 )
 install(TARGETS core FILE_SET HEADERS)
 

include/core/utils/Error.h → include/core/Error.h

@@ -1,7 +1,7 @@
 #ifndef CORE_ERROR_H
 #define CORE_ERROR_H
 
-#include "core/utils/Check.h"
+#include "core/Check.h"
 
 typedef int CoreError;
 #define CORE_ERROR_CODE(n) ((CoreError)(1 << n))

include/core/utils/Logger.h → include/core/Logger.h

@@ -1,7 +1,7 @@
 #ifndef CORE_LOGGER_H
 #define CORE_LOGGER_H
 
-#include "core/utils/Check.h"
+#include "core/Check.h"
 
 #define CORE_TERMINAL_RED "\33[1;31m"
 #define CORE_TERMINAL_YELLOW "\33[1;33m"

include/core/utils/Random.h → include/core/Random.h

@@ -1,7 +1,7 @@
 #ifndef CORE_RANDOM_H
 #define CORE_RANDOM_H
 
-#include "core/utils/Types.h"
+#include "core/Types.h"
 
 typedef struct {
     u32 data[25];

include/core/utils/Utility.h → include/core/Utility.h

@@ -1,8 +1,8 @@
 #ifndef CORE_UTILITY_H
 #define CORE_UTILITY_H
 
-#include "core/utils/Check.h"
-#include "core/utils/Types.h"
+#include "core/Check.h"
+#include "core/Types.h"
 
 size_t corePopCount(u64 u);
 

src/Buffer.c

@@ -1,8 +1,8 @@
-#include "core/utils/Buffer.h"
+#include "core/Buffer.h"
 
 #include <string.h>
 
-#include "core/utils/Utility.h"
+#include "core/Utility.h"
 
 void coreInitBuffer(CoreBuffer* b) {
     b->buffer = nullptr;

src/Logger.c

@@ -1,4 +1,4 @@
-#include "core/utils/Logger.h"
+#include "core/Logger.h"
 
 #include <stdarg.h>
 #include <stdio.h>

src/Random.c

@@ -1,4 +1,4 @@
-#include "core/utils/Random.h"
+#include "core/Random.h"
 
 static const size_t M = 7;
 

src/Utility.c

@@ -1,12 +1,12 @@
-#include "core/utils/Utility.h"
+#include "core/Utility.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "ErrorSimulator.h"
-#include "core/utils/Error.h"
-#include "core/utils/Logger.h"
+#include "core/Error.h"
+#include "core/Logger.h"
 
 static CoreExitHandler exitHandler = nullptr;
 static void* exitData = nullptr;

test/Main.c

@@ -4,8 +4,8 @@
 
 #include "Test.h"
 #include "Tests.h"
-#include "core/utils/Logger.h"
-#include "core/utils/Utility.h"
+#include "core/Logger.h"
+#include "core/Utility.h"
 
 static void onExit(int code, void* data) {
     unsigned int i = *(unsigned int*)(data);

test/Test.c

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core/utils/Logger.h"
+#include "core/Logger.h"
 
 typedef struct {
     char* file;

test/Test.h

@@ -1,7 +1,7 @@
 #ifndef CORE_TEST_H
 #define CORE_TEST_H
 
-#include "core/utils/Types.h"
+#include "core/Types.h"
 
 void coreFinalizeTests(void);
 

test/Tests.h

@@ -4,7 +4,6 @@
 #include "Test.h"
 
 void coreTestArrayList(bool light);
-void coreTestArrayString(void);
 void coreTestBitArray(void);
 void coreTestBox(void);
 void coreTestBuffer(bool light);
@@ -14,7 +13,6 @@ void coreTestColor(void);
 void coreTestComponents(void);
 void coreTestFileReader(void);
 void coreTestFrustum(void);
-void coreTestHashedString(void);
 void coreTestHashMap(bool light);
 void coreTestLinkedList(bool light);
 void coreTestList(bool light);
@@ -27,7 +25,6 @@ void coreTestRandom(bool light);
 void coreTestRingBuffer(void);
 void coreTestStack(bool light);
 void coreTestThread(void);
-void coreTestUniquePointer(void);
 void coreTestUtility(void);
 void coreTestInvalidAllocate(void);
 void coreTestInvalidReallocate(void);

test/modules/BufferTests.c

@@ -1,5 +1,5 @@
 #include "../Tests.h"
-#include "core/utils/Buffer.h"
+#include "core/Buffer.h"
 
 static const size_t SIZE_TYPES =
     sizeof(int) + sizeof(long) + sizeof(float) + sizeof(double);

test/modules/RandomTests.c

@@ -1,5 +1,5 @@
 #include "../Tests.h"
-#include "core/utils/Random.h"
+#include "core/Random.h"
 
 static void testAverage(bool light) {
     int limit = light ? 100000 : 1000000;

test/modules/UtilityTests.c

@@ -1,6 +1,6 @@
 #include "../../src/ErrorSimulator.h"
 #include "../Tests.h"
-#include "core/utils/Utility.h"
+#include "core/Utility.h"
 
 static void testPopCount() {
     CORE_TEST_U64(4, corePopCount(0xF));