improve PrimitiveAdd->Array(Object)

alec1o · May 28, 2024 · fb86a01 · fb86a01
1 parent b1dff05
commit fb86a01
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/src/primitive/partials/PrimitiveAdd.cs b/src/src/primitive/partials/PrimitiveAdd.cs
@@ -274,9 +274,8 @@ public void Array(object value)
                 if (!type.IsArray) return;
                 var childrenType = type.GetElementType();
                 if (childrenType == null) return;
-                var genericType = typeof(List<>).MakeGenericType(childrenType);
-                var list = Activator.CreateInstance(genericType) as IList<object>;
-                if (list == null) return;
+
+                var list = (IList)value;
 
                 Vault.Add(Prefix.Array);
 
@@ -286,7 +285,11 @@ public void Array(object value)
                 {
                     var collection = new List<byte>();
 
-                    foreach (var x in list) collection.AddRange(x.ToPrimitive());
+                    foreach (var x in list)
+                    {
+                        var result = x.ToPrimitive(childrenType);
+                        collection.AddRange(result);
+                    }
 
                     Vault.AddRange(BitConverter.GetBytes(size)); // objects count
                     Vault.AddRange(BitConverter.GetBytes(collection.Count)); // buffer size

diff --git a/test/primitive/ReadAndWrite.cs b/test/primitive/ReadAndWrite.cs
@@ -592,24 +592,17 @@ public void TestArrayFromStruct2()
         p.Add.Struct(real);
 
         Assert.Equal(0, p.Position);
-
-        // 1 struct prefix
-        // 1 array prefix
-        // 4 array elements
-        // 4 array buffer size
-        // 12 array buffer (4*3) 
-        // total 22
-        Assert.Equal(22, p.Data.Length);
-
+
+
         var clone = p.Get.Struct<ArrayFromStruct2>();
 
-        Assert.True(p.IsValid);
         Assert.Equal(real.Array, clone.Array);
         for (int i = 0; i < real.Array.Length; i++)
         {
             Assert.Equal(real.Array[i], clone.Array[i]);
         }
-
+
+        Assert.True(p.IsValid);
         Terminate(ref p);
     }