From 9c5ceacacb9913a1bfdc4fdfb7dd57e78af0a44a Mon Sep 17 00:00:00 2001
From: Mergul <wismerchil@interia.eu>
Date: Thu, 10 Oct 2019 22:14:18 +0200
Subject: [PATCH] -some cleanup

---
 source/ecs/block_allocator.d |  5 +----
 source/ecs/events.d          | 15 ++-------------
 source/ecs/id_manager.d      |  6 +-----
 source/ecs/manager.d         | 18 ++++++------------
 source/ecs/package.d         | 10 ++++++----
 source/ecs/simple_vector.d   |  3 ---
 source/ecs/std.d             |  2 +-
 7 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/source/ecs/block_allocator.d b/source/ecs/block_allocator.d
index abb7856..edd2275 100644
--- a/source/ecs/block_allocator.d
+++ b/source/ecs/block_allocator.d
@@ -2,11 +2,8 @@ module ecs.block_allocator;
 
 import ecs.manager;
 import ecs.std;
-/*
-import std.experimental.allocator;
-import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;*/
 
-struct BlockAllocator//(uint block_size, uint blocks_in_allocation)
+struct BlockAllocator
 {
     private uint block_size;
     private uint blocks_in_allocation;
diff --git a/source/ecs/events.d b/source/ecs/events.d
index b7fa8ed..6aa773f 100644
--- a/source/ecs/events.d
+++ b/source/ecs/events.d
@@ -1,23 +1,12 @@
 module ecs.events;
 
-import ecs.manager;
 import ecs.block_allocator;
 import ecs.entity;
+import ecs.manager;
 import ecs.std;
-/*
-import std.experimental.allocator;
-import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;*/
+
 import std.algorithm.comparison : max;
 
-//import core.sync.mutex;
-
-/*struct Event
-{
-    uint id;
-
-}*/
-
-//mixin template EventManagerCode()
 struct EventManager
 {
 
diff --git a/source/ecs/id_manager.d b/source/ecs/id_manager.d
index 8821918..1804390 100644
--- a/source/ecs/id_manager.d
+++ b/source/ecs/id_manager.d
@@ -1,15 +1,11 @@
 module ecs.id_manager;
-/*
-import std.experimental.allocator;
-import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;*/
 
 import ecs.entity;
-import ecs.vector;
 import ecs.std;
+import ecs.vector;
 
 import core.atomic;
 import core.stdc.string : memcpy;
-//import core.sync.mutex;
 
 /************************************************************************************************************************
 *IDManager is responsible for assignment and removing IDs. IDs are unique throughtout a whole duration of the program.
diff --git a/source/ecs/manager.d b/source/ecs/manager.d
index e3d37f3..6868474 100644
--- a/source/ecs/manager.d
+++ b/source/ecs/manager.d
@@ -5,25 +5,22 @@ module ecs.manager;
 
 import std.algorithm : max;
 import std.conv : to;
-//import std.experimental.allocator;
-//import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;
 import std.traits;
 
+import core.atomic;
 import core.stdc.stdlib : qsort;
 import core.stdc.string;
-import core.atomic;
-//import core.sync.mutex;
 
-import ecs.system;
-import ecs.entity;
+import ecs.system;//not ordered as forward reference bug workaround
 import ecs.block_allocator;
+import ecs.entity;
+import ecs.events;
 import ecs.hash_map;
 import ecs.id_manager;
-import ecs.vector;
 import ecs.simple_vector;
-import ecs.events;
-import ecs.traits;
 import ecs.std;
+import ecs.traits;
+import ecs.vector;
 
 export alias gEM = EntityManager.instance;
 export alias gEntityManager = EntityManager.instance;
@@ -491,9 +488,6 @@ export struct EntityManager
         {
             ComponentsIndices components_info;
 
-            //import core.stdc.stdlib;
-            //uint[] aaa = (cast(uint*)malloc(400))[0..100];
-
             bool checkExcludedComponentsSomething(Sys)()
             {
                 return __traits(compiles, allSameType!(string, typeof(Sys.ExcludedComponents))) && allSameType!(string,
diff --git a/source/ecs/package.d b/source/ecs/package.d
index fb40799..eda440d 100644
--- a/source/ecs/package.d
+++ b/source/ecs/package.d
@@ -1,8 +1,10 @@
 module ecs;
 
-public import ecs.manager;
-public import ecs.entity;
-public import ecs.system;
 public import ecs.core;
+public import ecs.entity;
+public import ecs.manager;
+public import ecs.system;
+
+import ecs.events;
 import ecs.id_manager;
-import ecs.events;
\ No newline at end of file
+import ecs.std;
\ No newline at end of file
diff --git a/source/ecs/simple_vector.d b/source/ecs/simple_vector.d
index 7d9cd7a..6310d69 100644
--- a/source/ecs/simple_vector.d
+++ b/source/ecs/simple_vector.d
@@ -1,7 +1,4 @@
 module ecs.simple_vector;
-/*
-import std.experimental.allocator;
-import std.experimental.allocator.mallocator;*/
 
 import ecs.std;
 
diff --git a/source/ecs/std.d b/source/ecs/std.d
index 8dfbccf..80fc895 100644
--- a/source/ecs/std.d
+++ b/source/ecs/std.d
@@ -2,8 +2,8 @@ module ecs.std;
 
 import core.stdc.stdlib : malloc, free, realloc;
 import core.stdc.string : memcpy;
+
 import std.traits;
-import core.time;
 
 version (Windows)
 {