From 65e51cadcd487e73956b97d8651166a3f1e1ee9a Mon Sep 17 00:00:00 2001
From: BeanCheeseBurrito <mrbeancheeseburrito@protonmail.com>
Date: Wed, 31 Jul 2024 22:12:03 -0700
Subject: [PATCH] Move iterable iterators to Invoker class

---
 src/Flecs.NET/Core/IIterator.cs      |  62 +--------------
 src/Flecs.NET/Core/IQueryBuilder.cs  |   4 +
 src/Flecs.NET/Core/Invoker.cs        | 109 +++++++++++++++++++++++++++
 src/Flecs.NET/Core/IterIterable.cs   |  16 ++--
 src/Flecs.NET/Core/PageIterable.cs   |  16 ++--
 src/Flecs.NET/Core/Query.cs          |  19 +++--
 src/Flecs.NET/Core/WorkerIterable.cs |  16 ++--
 7 files changed, 147 insertions(+), 95 deletions(-)

diff --git a/src/Flecs.NET/Core/IIterator.cs b/src/Flecs.NET/Core/IIterator.cs
index 7b19714c..fbce0da1 100644
--- a/src/Flecs.NET/Core/IIterator.cs
+++ b/src/Flecs.NET/Core/IIterator.cs
@@ -8,7 +8,7 @@ namespace Flecs.NET.Core
     ///     Interface for iterator structs.
     /// </summary>
     [SuppressMessage("Naming", "CA1716:Identifiers should not match keywords")]
-    public unsafe partial interface IIterator : IIterable
+    public unsafe interface IIterator : IIterable
     {
         /// <summary>
         ///     Iterates the query using the provided callback.
@@ -58,66 +58,6 @@ public unsafe partial interface IIterator : IIterable
         /// </summary>
         /// <param name="callback">The callback.</param>
         public void Run(delegate*<Iter, void> callback);
-#endif
-    }
-
-    // Iterators
-    public unsafe partial interface IIterator
-    {
-        internal static void Iter<T>(ref T iterable, Ecs.IterCallback callback) where T : unmanaged, IIterableBase
-        {
-            ecs_iter_t iter = iterable.GetIter();
-            while (iterable.GetNext(&iter))
-                Invoker.Iter(&iter, callback);
-        }
-
-        internal static void Each<T>(ref T iterable, Ecs.EachEntityCallback callback) where T : unmanaged, IIterableBase
-        {
-            ecs_iter_t iter = iterable.GetIter();
-            while (iterable.GetNext(&iter))
-                Invoker.Each(&iter, callback);
-        }
-
-        internal static void Each<T>(ref T iterable, Ecs.EachIterCallback callback) where T : unmanaged, IIterableBase
-        {
-            ecs_iter_t iter = iterable.GetIter();
-            while (iterable.GetNext(&iter))
-                Invoker.Each(&iter, callback);
-        }
-
-        internal static void Run<T>(ref T iterable, Ecs.RunCallback callback) where T : unmanaged, IIterableBase
-        {
-            ecs_iter_t iter = iterable.GetIter();
-            Invoker.Run(&iter, callback);
-        }
-
-#if NET5_0_OR_GREATER
-        internal static void Iter<T>(ref T iterable, delegate*<Iter, void> callback) where T : unmanaged, IIterableBase
-        {
-            ecs_iter_t iter = iterable.GetIter();
-            while (iterable.GetNext(&iter))
-                Invoker.Iter(&iter, callback);
-        }
-
-        internal static void Each<T>(ref T iterable, delegate*<Entity, void> callback) where T : unmanaged, IIterableBase
-        {
-            ecs_iter_t iter = iterable.GetIter();
-            while (iterable.GetNext(&iter))
-                Invoker.Each(&iter, callback);
-        }
-
-        internal static void Each<T>(ref T iterable, delegate*<Iter, int, void> callback) where T : unmanaged, IIterableBase
-        {
-            ecs_iter_t iter = iterable.GetIter();
-            while (iterable.GetNext(&iter))
-                Invoker.Each(&iter, callback);
-        }
-
-        internal static void Run<T>(ref T iterable, delegate*<Iter, void> callback) where T : unmanaged, IIterableBase
-        {
-            ecs_iter_t iter = iterable.GetIter();
-            Invoker.Run(&iter, callback);
-        }
 #endif
     }
 }
diff --git a/src/Flecs.NET/Core/IQueryBuilder.cs b/src/Flecs.NET/Core/IQueryBuilder.cs
index 68490eca..63e14924 100644
--- a/src/Flecs.NET/Core/IQueryBuilder.cs
+++ b/src/Flecs.NET/Core/IQueryBuilder.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using static Flecs.NET.Bindings.flecs;
 
 namespace Flecs.NET.Core
@@ -7,6 +8,7 @@ namespace Flecs.NET.Core
     ///     Query builder interface.
     /// </summary>
     /// <typeparam name="TQueryBuilder"></typeparam>
+    [SuppressMessage("Naming", "CA1716:Identifiers should not match keywords")]
     public unsafe interface IQueryBuilder<TQueryBuilder>
     {
         /// <summary>
@@ -434,8 +436,10 @@ public unsafe interface IQueryBuilder<TQueryBuilder>
         /// <inheritdoc cref="QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
         public ref TQueryBuilder GroupBy<T>(Ecs.GroupByCallback callback);
 
+        ///
         public ref TQueryBuilder GroupByCtx(void* ctx, Ecs.ContextFree contextFree);
 
+        ///
         public ref TQueryBuilder GroupByCtx(void* ctx);
 
         /// <inheritdoc cref="QueryBuilder.OnGroupCreate(Ecs.GroupCreateAction)"/>
diff --git a/src/Flecs.NET/Core/Invoker.cs b/src/Flecs.NET/Core/Invoker.cs
index 65f08f24..aacd0413 100644
--- a/src/Flecs.NET/Core/Invoker.cs
+++ b/src/Flecs.NET/Core/Invoker.cs
@@ -7,6 +7,7 @@ namespace Flecs.NET.Core
     /// <summary>
     ///     A static class for holding callback invokers.
     /// </summary>
+    // Iter Invokers
     public static unsafe partial class Invoker
     {
         /// <summary>
@@ -219,6 +220,114 @@ public static void Run(ecs_iter_t* iter, delegate*<Iter, delegate*<Iter, void>,
             iter->flags &= ~EcsIterIsValid;
             callback(new Iter(iter), &Callback);
         }
+#endif
+    }
+
+    // Iterable Invokers
+    public static unsafe partial class Invoker
+    {
+        /// <summary>
+        ///     Iterates over iterable with the provided Iter callback.
+        /// </summary>
+        /// <param name="iterable">The iterable object.</param>
+        /// <param name="callback">The callback.</param>
+        /// <typeparam name="T">The iterable type.</typeparam>
+        public static void Iter<T>(ref T iterable, Ecs.IterCallback callback) where T : unmanaged, IIterableBase
+        {
+            ecs_iter_t iter = iterable.GetIter();
+            while (iterable.GetNext(&iter))
+                Iter(&iter, callback);
+        }
+
+        /// <summary>
+        ///     Iterates over iterable with the provided Each callback.
+        /// </summary>
+        /// <param name="iterable">The iterable object.</param>
+        /// <param name="callback">The callback.</param>
+        /// <typeparam name="T">The iterable type.</typeparam>
+        public static void Each<T>(ref T iterable, Ecs.EachEntityCallback callback) where T : unmanaged, IIterableBase
+        {
+            ecs_iter_t iter = iterable.GetIter();
+            while (iterable.GetNext(&iter))
+                Each(&iter, callback);
+        }
+
+        /// <summary>
+        ///     Iterates over iterable with the provided Each callback.
+        /// </summary>
+        /// <param name="iterable">The iterable object.</param>
+        /// <param name="callback">The callback.</param>
+        /// <typeparam name="T">The iterable type.</typeparam>
+        public static void Each<T>(ref T iterable, Ecs.EachIterCallback callback) where T : unmanaged, IIterableBase
+        {
+            ecs_iter_t iter = iterable.GetIter();
+            while (iterable.GetNext(&iter))
+                Each(&iter, callback);
+        }
+
+        /// <summary>
+        ///     Iterates over iterable with the provided Run callback.
+        /// </summary>
+        /// <param name="iterable">The iterable object.</param>
+        /// <param name="callback">The callback.</param>
+        /// <typeparam name="T">The iterable type.</typeparam>
+        public static void Run<T>(ref T iterable, Ecs.RunCallback callback) where T : unmanaged, IIterableBase
+        {
+            ecs_iter_t iter = iterable.GetIter();
+            Run(&iter, callback);
+        }
+
+#if NET5_0_OR_GREATER
+        /// <summary>
+        ///     Iterates over iterable with the provided Iter callback.
+        /// </summary>
+        /// <param name="iterable">The iterable object.</param>
+        /// <param name="callback">The callback.</param>
+        /// <typeparam name="T">The iterable type.</typeparam>
+        public static void Iter<T>(ref T iterable, delegate*<Iter, void> callback) where T : unmanaged, IIterableBase
+        {
+            ecs_iter_t iter = iterable.GetIter();
+            while (iterable.GetNext(&iter))
+                Iter(&iter, callback);
+        }
+
+        /// <summary>
+        ///     Iterates over iterable with the provided Each callback.
+        /// </summary>
+        /// <param name="iterable">The iterable object.</param>
+        /// <param name="callback">The callback.</param>
+        /// <typeparam name="T">The iterable type.</typeparam>
+        public static void Each<T>(ref T iterable, delegate*<Entity, void> callback) where T : unmanaged, IIterableBase
+        {
+            ecs_iter_t iter = iterable.GetIter();
+            while (iterable.GetNext(&iter))
+                Each(&iter, callback);
+        }
+
+        /// <summary>
+        ///     Iterates over iterable with the provided Each callback.
+        /// </summary>
+        /// <param name="iterable">The iterable object.</param>
+        /// <param name="callback">The callback.</param>
+        /// <typeparam name="T">The iterable type.</typeparam>
+        public static void Each<T>(ref T iterable, delegate*<Iter, int, void> callback) where T : unmanaged, IIterableBase
+        {
+            ecs_iter_t iter = iterable.GetIter();
+            while (iterable.GetNext(&iter))
+                Each(&iter, callback);
+        }
+
+        /// <summary>
+        ///     Iterates over iterable with the provided Run callback.
+        /// </summary>
+        /// <param name="iterable">The iterable object.</param>
+        /// <param name="callback">The callback.</param>
+        /// <typeparam name="T">The iterable type.</typeparam>
+        public static void Run<T>(ref T iterable, delegate*<Iter, void> callback) where T : unmanaged, IIterableBase
+        {
+            ecs_iter_t iter = iterable.GetIter();
+            Run(&iter, callback);
+        }
 #endif
     }
 }
diff --git a/src/Flecs.NET/Core/IterIterable.cs b/src/Flecs.NET/Core/IterIterable.cs
index e1d6e1ba..5168aa1c 100644
--- a/src/Flecs.NET/Core/IterIterable.cs
+++ b/src/Flecs.NET/Core/IterIterable.cs
@@ -428,50 +428,50 @@ public unsafe partial struct IterIterable
         /// <inheritdoc cref="IIterator.Iter(Ecs.IterCallback)"/>
         public void Iter(Ecs.IterCallback callback)
         {
-            IIterator.Iter(ref this, callback);
+            Invoker.Iter(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachEntityCallback)"/>
         public void Each(Ecs.EachEntityCallback callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachIterCallback)"/>
         public void Each(Ecs.EachIterCallback callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Run(Ecs.RunCallback)"/>
         public void Run(Ecs.RunCallback callback)
         {
-            IIterator.Run(ref this, callback);
+            Invoker.Run(ref this, callback);
         }
 
 #if NET5_0_OR_GREATER
         /// <inheritdoc cref="IIterator.Iter(Ecs.IterCallback)"/>
         public void Iter(delegate*<Iter, void> callback)
         {
-            IIterator.Iter(ref this, callback);
+            Invoker.Iter(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachEntityCallback)"/>
         public void Each(delegate*<Entity, void> callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachIterCallback)"/>
         public void Each(delegate*<Iter, int, void> callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Run(Ecs.RunCallback)"/>
         public void Run(delegate*<Iter, void> callback)
         {
-            IIterator.Run(ref this, callback);
+            Invoker.Run(ref this, callback);
         }
 #endif
     }
diff --git a/src/Flecs.NET/Core/PageIterable.cs b/src/Flecs.NET/Core/PageIterable.cs
index c0627de3..d379a6ea 100644
--- a/src/Flecs.NET/Core/PageIterable.cs
+++ b/src/Flecs.NET/Core/PageIterable.cs
@@ -198,50 +198,50 @@ public unsafe partial struct PageIterable
         /// <inheritdoc cref="IIterator.Iter(Ecs.IterCallback)"/>
         public void Iter(Ecs.IterCallback callback)
         {
-            IIterator.Iter(ref this, callback);
+            Invoker.Iter(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachEntityCallback)"/>
         public void Each(Ecs.EachEntityCallback callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachIterCallback)"/>
         public void Each(Ecs.EachIterCallback callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Run(Ecs.RunCallback)"/>
         public void Run(Ecs.RunCallback callback)
         {
-            IIterator.Run(ref this, callback);
+            Invoker.Run(ref this, callback);
         }
 
 #if NET5_0_OR_GREATER
         /// <inheritdoc cref="IIterator.Iter(Ecs.IterCallback)"/>
         public void Iter(delegate*<Iter, void> callback)
         {
-            IIterator.Iter(ref this, callback);
+            Invoker.Iter(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachEntityCallback)"/>
         public void Each(delegate*<Entity, void> callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachIterCallback)"/>
         public void Each(delegate*<Iter, int, void> callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Run(Ecs.RunCallback)"/>
         public void Run(delegate*<Iter, void> callback)
         {
-            IIterator.Run(ref this, callback);
+            Invoker.Run(ref this, callback);
         }
 #endif
     }
diff --git a/src/Flecs.NET/Core/Query.cs b/src/Flecs.NET/Core/Query.cs
index fa6fcd9f..87b4728f 100644
--- a/src/Flecs.NET/Core/Query.cs
+++ b/src/Flecs.NET/Core/Query.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using Flecs.NET.Utilities;
 using static Flecs.NET.Bindings.flecs;
 
@@ -9,7 +8,7 @@ namespace Flecs.NET.Core
     /// <summary>
     ///     A wrapper around ecs_query_t.
     /// </summary>
-    public unsafe partial struct Query : IIterator, IEquatable<Query>, IDisposable
+    public unsafe partial struct Query : IEquatable<Query>, IDisposable, IIterator
     {
         private ecs_query_t* _handle;
 
@@ -433,50 +432,50 @@ public unsafe partial struct Query
         /// <inheritdoc cref="IIterator.Iter(Ecs.IterCallback)"/>
         public void Iter(Ecs.IterCallback callback)
         {
-            IIterator.Iter(ref this, callback);
+            Invoker.Iter(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachEntityCallback)"/>
         public void Each(Ecs.EachEntityCallback callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachIterCallback)"/>
         public void Each(Ecs.EachIterCallback callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Run(Ecs.RunCallback)"/>
         public void Run(Ecs.RunCallback callback)
         {
-            IIterator.Run(ref this, callback);
+            Invoker.Run(ref this, callback);
         }
 
 #if NET5_0_OR_GREATER
         /// <inheritdoc cref="IIterator.Iter(Ecs.IterCallback)"/>
         public void Iter(delegate*<Iter, void> callback)
         {
-            IIterator.Iter(ref this, callback);
+            Invoker.Iter(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachEntityCallback)"/>
         public void Each(delegate*<Entity, void> callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachIterCallback)"/>
         public void Each(delegate*<Iter, int, void> callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Run(Ecs.RunCallback)"/>
         public void Run(delegate*<Iter, void> callback)
         {
-            IIterator.Run(ref this, callback);
+            Invoker.Run(ref this, callback);
         }
 #endif
     }
diff --git a/src/Flecs.NET/Core/WorkerIterable.cs b/src/Flecs.NET/Core/WorkerIterable.cs
index 2f52a6c8..f6daf84d 100644
--- a/src/Flecs.NET/Core/WorkerIterable.cs
+++ b/src/Flecs.NET/Core/WorkerIterable.cs
@@ -198,50 +198,50 @@ public unsafe partial struct WorkerIterable
         /// <inheritdoc cref="IIterator.Iter(Ecs.IterCallback)"/>
         public void Iter(Ecs.IterCallback callback)
         {
-            IIterator.Iter(ref this, callback);
+            Invoker.Iter(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachEntityCallback)"/>
         public void Each(Ecs.EachEntityCallback callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachIterCallback)"/>
         public void Each(Ecs.EachIterCallback callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Run(Ecs.RunCallback)"/>
         public void Run(Ecs.RunCallback callback)
         {
-            IIterator.Run(ref this, callback);
+            Invoker.Run(ref this, callback);
         }
 
 #if NET5_0_OR_GREATER
         /// <inheritdoc cref="IIterator.Iter(Ecs.IterCallback)"/>
         public void Iter(delegate*<Iter, void> callback)
         {
-            IIterator.Iter(ref this, callback);
+            Invoker.Iter(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachEntityCallback)"/>
         public void Each(delegate*<Entity, void> callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Each(Ecs.EachIterCallback)"/>
         public void Each(delegate*<Iter, int, void> callback)
         {
-            IIterator.Each(ref this, callback);
+            Invoker.Each(ref this, callback);
         }
 
         /// <inheritdoc cref="IIterator.Run(Ecs.RunCallback)"/>
         public void Run(delegate*<Iter, void> callback)
         {
-            IIterator.Run(ref this, callback);
+            Invoker.Run(ref this, callback);
         }
 #endif
     }