immutable array

andreakarasho · Feb 25, 2024 · 8aba07e · 8aba07e
1 parent f024825
commit 8aba07e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/src/DotnetAddons.cs b/src/DotnetAddons.cs
@@ -134,7 +134,7 @@ public static Span<T> AsSpan<T>(List<T>? list)
 	// }
 }
 
-public static class SortExtensions
+public static class DotnetExtensions
 {
 	public static void Sort<T>(this Span<T> span) where T : IComparable<T>
 	{
@@ -169,5 +169,10 @@ public static void Sort<T>(this Span<T> span, IComparer<T> comparer)
 			}
 		}
 	}
+
+	public static System.Collections.Immutable.ImmutableArray<TSource> ToImmutableArray<TSource>(this IEnumerable<TSource> items)
+	{
+		return System.Collections.Immutable.ImmutableArray.CreateRange(items);
+	}
 }
 #endif
diff --git a/src/World.cs b/src/World.cs
@@ -1,3 +1,4 @@
+using System.Collections.Immutable;
 using Microsoft.Collections.Extensions;
 
 namespace TinyEcs;
@@ -409,7 +410,7 @@ internal FilterQuery(ReadOnlySpan<Archetype> archetypes)
 	public void Query(QueryFilterDelegateWithEntity fn)
 	{
 		var terms = Lookup.Query<TFilter>.Terms;
-		var query = new QueryInternal(_archetypes, terms);
+		var query = new QueryInternal(_archetypes, terms.AsSpan());
 		foreach (var arch in query)
 		{
 			foreach (ref readonly var chunk in arch)
@@ -427,7 +428,7 @@ public void Query(QueryFilterDelegateWithEntity fn)
 
 	public QueryIterator GetEnumerator()
     {
-        return new QueryIterator(_archetypes, Lookup.Query<TFilter>.Terms);
+        return new QueryIterator(_archetypes, Lookup.Query<TFilter>.Terms.AsSpan());
     }
 }
 
@@ -550,7 +551,7 @@ private static int GetSize()
 		}
     }
 
-	static void ParseTuple(ITuple tuple, HashSet<Term> terms)
+	static void ParseTuple(ITuple tuple, SortedSet<Term> terms)
 	{
 		for (var i = 0; i < tuple.Length; ++i)
 		{
@@ -571,7 +572,7 @@ static void ParseTuple(ITuple tuple, HashSet<Term> terms)
 		}
 	}
 
-	static void ParseType<T>(HashSet<Term> terms) where T : struct
+	static void ParseType<T>(SortedSet<Term> terms) where T : struct
 	{
 		var type = typeof(T);
 		if (_typesConvertion.TryGetValue(type, out var id))
@@ -597,32 +598,29 @@ static void ParseType<T>(HashSet<Term> terms) where T : struct
 
     internal static class Query<TQuery, TFilter> where TQuery : struct where TFilter : struct
 	{
-		public static readonly Term[] Terms;
-		public static readonly Term[] Columns;
+		public static readonly ImmutableArray<Term> Terms;
+		public static readonly ImmutableArray<Term> Columns;
 
 		static Query()
 		{
-			var list = new HashSet<Term>();
+			var list = new SortedSet<Term>();
 			ParseType<TQuery>(list);
-			Columns = list.ToArray();
-			Array.Sort(Columns);
+			Columns = list.ToImmutableArray();
 
 			ParseType<TFilter>(list);
-			Terms = list.ToArray();
-			Array.Sort(Terms);
+			Terms = list.ToImmutableArray();
 		}
 	}
 
 	internal static class Query<T> where T : struct
 	{
-		public static readonly Term[] Terms;
+		public static readonly ImmutableArray<Term> Terms;
 
 		static Query()
 		{
-			var list = new HashSet<Term>();
+			var list = new SortedSet<Term>();
 			ParseType<T>(list);
-			Terms = list.ToArray();
-			Array.Sort(Terms);
+			Terms = list.ToImmutableArray();
 		}
 	}
 }

diff --git a/tools/TinyEcs.Generator/Program.cs b/tools/TinyEcs.Generator/Program.cs
@@ -107,7 +107,7 @@ public partial {className}{filter}
 				sb.AppendLine($@"
 						public void Query<{typeParams}>({delegateName}<{typeParams}> fn) {whereParams}
 						{{
-							var terms = Lookup.Query<{(i > 0 ? "(" : "")}{typeParams}{(i > 0 ? ")" : "")}{filterMethod}>.Terms;
+							var terms = Lookup.Query<{(i > 0 ? "(" : "")}{typeParams}{(i > 0 ? ")" : "")}{filterMethod}>.Terms.AsSpan();
 							var query = new QueryInternal({(withFilter ? "_archetypes" : "Archetypes")}, terms);
 							foreach (var arch in query)
 							{{