Fix From segment factories

pfpack · Aug 21, 2023 · edd1771 · edd1771
1 parent adaa521
commit edd1771
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 18 deletions.
diff --git a/src/flatcollections-array/FlatArray/FlatArray.T.Builder/FlatArray.Builder.Factory.From.cs b/src/flatcollections-array/FlatArray/FlatArray.T.Builder/FlatArray.Builder.Factory.From.cs
@@ -41,7 +41,6 @@ private static Builder InnerFromArray(T[] source)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static Builder InnerFromFlatArray(FlatArray<T> source)
             =>
-            // Work with the inner state of FlatArray here
             source.length == default ? new() : new(InnerArrayHelper.Copy(source.items!, source.length), default);
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Factory.Explicit.From.Array.cs b/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Factory.Explicit.From.Array.cs
@@ -22,6 +22,6 @@ internal static FlatArray<T> InternalFromArrayChecked([AllowNull] T[] source, in
             throw InnerExceptionFactory.SegmentIsNotWithinArray(start, length, sourceLength);
         }
 
-        return source is null ? default : InnerFactory.FromArray(source, length);
+        return source is null ? default : InnerFactory.FromArray(source, start, length);
     }
 }
diff --git a/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Factory.Explicit.From.FlatArray.cs b/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Factory.Explicit.From.FlatArray.cs
@@ -27,6 +27,6 @@ internal static FlatArray<T> InternalFromFlatArrayChecked(FlatArray<T> source, i
             throw InnerExceptionFactory.SegmentIsNotWithinArray(start, length, source.length);
         }
 
-        return InnerFactory.FromFlatArray(source, length);
+        return InnerFactory.FromFlatArray(source, start, length);
     }
 }
diff --git a/...collections-array/FlatArray/FlatArray.T/FlatArray.Factory.Explicit.From.ImmutableArray.cs b/...collections-array/FlatArray/FlatArray.T/FlatArray.Factory.Explicit.From.ImmutableArray.cs
@@ -31,6 +31,6 @@ internal static FlatArray<T> InternalFromImmutableArrayChecked(ImmutableArray<T>
             throw InnerExceptionFactory.SegmentIsNotWithinArray(start, length, sourceLength);
         }
 
-        return InnerFactory.FromImmutableArray(source, length);
+        return InnerFactory.FromImmutableArray(source, start, length);
     }
 }
diff --git a/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Factory.Explicit.From.List.cs b/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Factory.Explicit.From.List.cs
@@ -23,6 +23,6 @@ internal static FlatArray<T> InternalFromListChecked([AllowNull] List<T> source,
             throw InnerExceptionFactory.SegmentIsNotWithinArray(start, length, sourceLength);
         }
 
-        return source is null ? default : InnerFactory.FromList(source, length);
+        return source is null ? default : InnerFactory.FromList(source, start, length);
     }
 }
diff --git a/...latcollections-array/FlatArray/FlatArray.T/InnerArrayHelper/FlatArray.InnerArrayHelper.cs b/...latcollections-array/FlatArray/FlatArray.T/InnerArrayHelper/FlatArray.InnerArrayHelper.cs
@@ -12,7 +12,7 @@ internal static T[] Copy(T[] array)
             =>
             new ReadOnlySpan<T>(array).ToArray();
 
-        // The caller MUST ensure the length is within the source length
+        // The caller MUST ensure the length is within the array length
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal static T[] Copy(T[] array, int length)
         {
@@ -24,6 +24,18 @@ internal static T[] Copy(T[] array, int length)
             return sourceSpan.ToArray();
         }
 
+        // The caller MUST ensure the segment is within the array
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static T[] CopySegment(T[] array, int start, int length)
+        {
+            Debug.Assert(InnerAllocHelper.IsSegmentWithin(start, length, array.Length));
+
+            var sourceSpan = start == default && length == array.Length
+                ? new ReadOnlySpan<T>(array)
+                : new ReadOnlySpan<T>(array, start, length);
+            return sourceSpan.ToArray();
+        }
+
         // The caller MUST ensure the lengths are within the arrays actual lengths
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal static T[] Concat(T[] array1, int length1, T[] array2, int length2)

diff --git a/...tcollections-array/FlatArray/FlatArray.T/InnerFactory/FlatArray.InnerFactory.FromArray.cs b/...tcollections-array/FlatArray/FlatArray.T/InnerFactory/FlatArray.InnerFactory.FromArray.cs
@@ -13,11 +13,11 @@ internal static FlatArray<T> FromArray(T[] source)
             source.Length == default ? default : new(InnerArrayHelper.Copy(source), default);
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static FlatArray<T> FromArray(T[] source, int length)
+        internal static FlatArray<T> FromArray(T[] source, int start, int length)
         {
-            Debug.Assert(length >= 0 && length <= source.Length);
+            Debug.Assert(InnerAllocHelper.IsSegmentWithin(start, length, source.Length));
 
-            return length == default ? default : new(InnerArrayHelper.Copy(source, length), default);
+            return length == default ? default : new(InnerArrayHelper.CopySegment(source, start, length), default);
         }
     }
 }
diff --git a/...lections-array/FlatArray/FlatArray.T/InnerFactory/FlatArray.InnerFactory.FromFlatArray.cs b/...lections-array/FlatArray/FlatArray.T/InnerFactory/FlatArray.InnerFactory.FromFlatArray.cs
@@ -13,11 +13,11 @@ internal static FlatArray<T> FromFlatArray(FlatArray<T> source)
             source.length == default ? default : new(InnerArrayHelper.Copy(source.items!, source.length), default);
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static FlatArray<T> FromFlatArray(FlatArray<T> source, int length)
+        internal static FlatArray<T> FromFlatArray(FlatArray<T> source, int start, int length)
         {
-            Debug.Assert(length >= 0 && length <= source.length);
+            Debug.Assert(InnerAllocHelper.IsSegmentWithin(start, length, source.length));
 
-            return length == default ? default : new(InnerArrayHelper.Copy(source.items!, length), default);
+            return length == default ? default : new(InnerArrayHelper.CopySegment(source.items!, start, length), default);
         }
     }
 }
diff --git a/...ons-array/FlatArray/FlatArray.T/InnerFactory/FlatArray.InnerFactory.FromImmutableArray.cs b/...ons-array/FlatArray/FlatArray.T/InnerFactory/FlatArray.InnerFactory.FromImmutableArray.cs
@@ -23,17 +23,17 @@ internal static FlatArray<T> FromImmutableArray(ImmutableArray<T> source)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static FlatArray<T> FromImmutableArray(ImmutableArray<T> source, int length)
+        internal static FlatArray<T> FromImmutableArray(ImmutableArray<T> source, int start, int length)
         {
-            //Debug.Assert(length >= 0 && length <= source.Length);
+            Debug.Assert(InnerAllocHelper.IsSegmentWithin(start, length, source.IsDefault ? default : source.Length));
 
             if (source.IsDefaultOrEmpty)
             {
                 return default;
             }
 
             var array = new T[length];
-            source.CopyTo(0, array, 0, length);
+            source.CopyTo(start, array, 0, length);
 
             return new(array, default);
         }

diff --git a/...atcollections-array/FlatArray/FlatArray.T/InnerFactory/FlatArray.InnerFactory.FromList.cs b/...atcollections-array/FlatArray/FlatArray.T/InnerFactory/FlatArray.InnerFactory.FromList.cs
@@ -24,17 +24,17 @@ internal static FlatArray<T> FromList(List<T> source)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static FlatArray<T> FromList(List<T> source, int length)
+        internal static FlatArray<T> FromList(List<T> source, int start, int length)
         {
-            Debug.Assert(length >= 0 && length <= source.Count);
+            Debug.Assert(InnerAllocHelper.IsSegmentWithin(start, length, source.Count));
 
             if (length == default)
             {
                 return default;
             }
 
             var array = new T[length];
-            source.CopyTo(0, array, 0, length);
+            source.CopyTo(start, array, 0, length);
 
             return new(array, default);
         }