Major overhaul

source/numem/all.d

@@ -1,13 +1,19 @@
+/*
+    Copyright © 2024, Inochi2D Project
+    Distributed under the 2-Clause BSD License, see LICENSE file.
+
+    Authors: Luna the Foxgirl
+*/
+
 /**
     Automatically imports all of the numem types.
 */
 module numem.all;
 
-public import numem.mem;
-public import numem.mem.ptr;
-public import numem.mem.string;
-public import numem.mem.vector;
-public import numem.mem.map;
-public import numem.mem.set;
-public import numem.mem.exception;
+public import numem.core;
+public import numem.core.memory;
+public import numem.collections;
+public import numem.core.exception;
 public import numem.io;
+public import numem.string;
+public import numem.conv;

source/numem/mem/internal/btree.d → source/numem/collections/internal/btree.d

@@ -6,8 +6,8 @@
 * License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
 * Authors:   Guillaume Piolat
 */
-module numem.mem.internal.btree;
-import numem.mem;
+module numem.collections.internal.btree;
+import numem.core;
 
 import std.functional : binaryFun;
 

source/numem/collections/internal/package.d

@@ -0,0 +1,7 @@
+/*
+    Copyright © 2023, Inochi2D Project
+    Distributed under the 2-Clause BSD License, see LICENSE file.
+    
+    Authors: Luna Nielsen
+*/
+module numem.core.internal;

source/numem/mem/map.d → source/numem/collections/map.d

@@ -13,9 +13,9 @@
     License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
     Authors:   Authors: Steven Schveighoffer, $(HTTP erdani.com, Andrei Alexandrescu), Guillaume Piolat
 */
-module numem.mem.map;
-import numem.mem.internal.btree;
-import numem.mem;
+module numem.collections.map;
+import numem.collections.internal.btree;
+import numem.core;
 import std.functional : binaryFun;
 
 @nogc:

source/numem/collections/package.d

@@ -0,0 +1,15 @@
+/*
+    Copyright © 2023, Inochi2D Project
+    Distributed under the 2-Clause BSD License, see LICENSE file.
+    
+    Authors: Luna Nielsen
+*/
+
+/**
+    Standard numem collection types.
+*/
+module numem.collections;
+
+public import numem.collections.vector;
+public import numem.collections.set;
+public import numem.collections.map;

source/numem/mem/set.d → source/numem/collections/set.d

@@ -13,9 +13,9 @@
     License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
     Authors:   Authors: Steven Schveighoffer, $(HTTP erdani.com, Andrei Alexandrescu), Guillaume Piolat
 */
-module numem.mem.set;
-import numem.mem.internal.btree;
-import numem.mem;
+module numem.collections.set;
+import numem.collections.internal.btree;
+import numem.core;
 import std.functional : binaryFun;
 
 

source/numem/mem/vector.d → source/numem/collections/vector.d

@@ -1,12 +1,13 @@
 /*
-    Copyright © 2023, Inochi2D Project
+    Copyright © 2024, Inochi2D Project
     Distributed under the 2-Clause BSD License, see LICENSE file.
-    
-    Authors: Luna Nielsen
+
+    Authors: Luna the Foxgirl
 */
-module numem.mem.vector;
-import numem.mem.ptr;
-import numem.mem;
+
+module numem.collections.vector;
+import numem.core.memory.smartptr;
+import numem.core;
 import core.stdc.stdlib : malloc, realloc, free;
 import core.stdc.string : memcpy, memmove;
 import core.atomic : atomicFetchAdd, atomicFetchSub, atomicStore, atomicLoad;

source/numem/conv.d

@@ -1,3 +1,10 @@
+/*
+    Copyright © 2024, Inochi2D Project
+    Distributed under the 2-Clause BSD License, see LICENSE file.
+
+    Authors: Luna the Foxgirl
+*/
+
 /**
     Utilities for converting between some basic types
 */
@@ -11,7 +18,7 @@ version(NoC) {
     import core.stdc.stdlib;
     import core.stdc.stdio : snprintf;
     import std.traits;
-    import numem.mem.exception;
+    import numem.core.exception;
 
     @nogc:
 

source/numem/mem/exception.d → source/numem/core/exception.d

@@ -1,11 +1,19 @@
+/*
+    Copyright © 2024, Inochi2D Project
+    Distributed under the 2-Clause BSD License, see LICENSE file.
+
+    Authors: Luna the Foxgirl
+*/
+
 /**
     Numem Exception support
 */
-module numem.mem.exception;
-import numem.mem.string;
-import numem.mem;
+module numem.core.exception;
+import numem.string;
+import numem.core;
+
 import core.stdc.stdio;
-import numem.mem.internal.trace;
+import numem.core.trace;
 
 @nogc:
 

source/numem/mem/package.d → source/numem/core/memory/package.d

@@ -4,11 +4,14 @@
     
     Authors: Luna Nielsen
 */
-module numem.mem;
+
+module numem.core.memory;
 import core.stdc.stdlib : free, exit, malloc;
 import std.traits;
-import numem.mem.utils;
-import numem.mem.internal.trace;
+import numem.core.utils;
+import numem.core.trace;
+
+public import numem.core.memory.smartptr;
 
 version(Have_tinyd_rt) {
     private __gshared

source/numem/mem/ptr.d → source/numem/core/memory/smartptr.d

@@ -4,10 +4,11 @@
     
     Authors: Luna Nielsen
 */
-module numem.mem.ptr;
+
+module numem.core.memory.smartptr;
 import core.atomic : atomicFetchAdd, atomicFetchSub, atomicStore, atomicLoad;
 import std.traits;
-import numem.mem;
+import numem.core;
 
 //
 //          SMART POINTERS
@@ -600,7 +601,7 @@ unittest {
 
 @("unique_ptr: move to array")
 unittest {
-    import numem.mem.vector;
+    import numem.collections.vector;
     struct A { int b; }
 
     vector!(unique_ptr!A) uniques;

source/numem/core/package.d

@@ -0,0 +1,3 @@
+module numem.core;
+
+public import numem.core.memory;