Use foreach for full iteration of arrays

NetFabric · Aug 18, 2020 · b1fd6fb · b1fd6fb
1 parent 07a6f53
commit b1fd6fb
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 91 deletions.
diff --git a/NetFabric.Hyperlinq/Aggregation/Count/Count.ArraySegment.cs b/NetFabric.Hyperlinq/Aggregation/Count/Count.ArraySegment.cs
@@ -18,10 +18,9 @@ static unsafe int Count<TSource>(this in ArraySegment<TSource> source, Predicate
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    foreach (var item in source.Array)
                     {
-                        var result = predicate(array![index]);
+                        var result = predicate(item);
                         counter += *(int*)&result;
                     }
                 }
@@ -46,11 +45,12 @@ static unsafe int Count<TSource>(this in ArraySegment<TSource> source, Predicate
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    var index = 0;
+                    foreach (var item in source.Array)
                     {
-                        var result = predicate(array![index], index);
+                        var result = predicate(item, index);
                         counter += *(int*)&result;
+                        index++;
                     }
                 }
                 else

diff --git a/NetFabric.Hyperlinq/Conversion/ToDictionary/ToDictionary.ArraySegment.cs b/NetFabric.Hyperlinq/Conversion/ToDictionary/ToDictionary.ArraySegment.cs
@@ -17,12 +17,8 @@ public static partial class ArrayExtensions
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
-                    {
-                        var item = array![index];
+                    foreach (var item in source.Array)
                         dictionary.Add(keySelector(item), item);
-                    }
                 }
                 else
                 {
@@ -48,12 +44,8 @@ public static partial class ArrayExtensions
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
-                    {
-                        var item = array![index];
+                    foreach (var item in source.Array)
                         dictionary.Add(keySelector(item), elementSelector(item)!);
-                    }
                 }
                 else
                 {

diff --git a/NetFabric.Hyperlinq/Element/ElementAt/ElementAt.ArraySegment.cs b/NetFabric.Hyperlinq/Element/ElementAt/ElementAt.ArraySegment.cs
@@ -17,10 +17,8 @@ static Option<TSource> ElementAt<TSource>(this in ArraySegment<TSource> source,
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var sourceIndex = 0; sourceIndex < array.Length; sourceIndex++)
+                    foreach (var item in source.Array)
                     {
-                        var item = array![sourceIndex];
                         if (predicate(item) && index-- == 0)
                             return Option.Some(item);
                     }
@@ -47,12 +45,13 @@ static Option<TSource> ElementAt<TSource>(this in ArraySegment<TSource> source,
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var sourceIndex = 0; sourceIndex < array.Length; sourceIndex++)
+                    var sourceIndex = 0;
+                    foreach (var item in source.Array)
                     {
-                        var item = array![sourceIndex];
                         if (predicate(item, sourceIndex) && index-- == 0)
                             return Option.Some(item);
+
+                        sourceIndex++;
                     }
                 }
                 else
@@ -106,10 +105,8 @@ static Option<TSource> ElementAt<TSource>(this in ArraySegment<TSource> source,
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var sourceIndex = 0; sourceIndex < array.Length; sourceIndex++)
+                    foreach (var item in source.Array)
                     {
-                        var item = array![sourceIndex];
                         if (predicate(item) && index-- == 0)
                             return Option.Some(selector(item));
                     }

diff --git a/NetFabric.Hyperlinq/Element/First/First.ArraySegment.cs b/NetFabric.Hyperlinq/Element/First/First.ArraySegment.cs
@@ -18,10 +18,8 @@ static Option<TSource> First<TSource>(this in ArraySegment<TSource> source, Pred
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    foreach (var item in source.Array)
                     {
-                        var item = array![index];
                         if (predicate(item))
                             return Option.Some(item);
                     }
@@ -47,12 +45,13 @@ static Option<TSource> First<TSource>(this in ArraySegment<TSource> source, Pred
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    var index = 0;
+                    foreach (var item in source.Array)
                     {
-                        var item = array![index];
                         if (predicate(item, index))
                             return Option.Some(item);
+
+                        index++;
                     }
                 }
                 else
@@ -106,10 +105,8 @@ static Option<TSource> First<TSource>(this in ArraySegment<TSource> source, Pred
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    foreach (var item in source.Array)
                     {
-                        var item = array![index];
                         if (predicate(item))
                             return Option.Some(selector(item));
                     }

diff --git a/NetFabric.Hyperlinq/Projection/Select/Select.ArraySegment.cs b/NetFabric.Hyperlinq/Projection/Select/Select.ArraySegment.cs
@@ -87,11 +87,13 @@ int IList<TResult>.IndexOf(TResult item)
                     {
                         if (Utils.IsValueType<TResult>())
                         {
-                            var array = source.Array;
-                            for (var index = 0; index < array.Length; index++)
+                            var index = 0;
+                            foreach (var sourceItem in source.Array)
                             {
-                                if (EqualityComparer<TResult>.Default.Equals(selector(array![index])!, item))
+                                if (EqualityComparer<TResult>.Default.Equals(selector(sourceItem)!, item))
                                     return index;
+
+                                index++;
                             }
                         }
                         else

diff --git a/NetFabric.Hyperlinq/Projection/SelectAt/SelectAt.ArraySegment.cs b/NetFabric.Hyperlinq/Projection/SelectAt/SelectAt.ArraySegment.cs
@@ -88,10 +88,10 @@ int IList<TResult>.IndexOf(TResult item)
                     {
                         if (Utils.IsValueType<TResult>())
                         {
-                            var array = source.Array;
-                            for (var index = 0; index < array.Length; index++)
+                            var index = 0;
+                            foreach (var sourceItem in source.Array)
                             {
-                                if (EqualityComparer<TResult>.Default.Equals(selector(array![index], index)!, item))
+                                if (EqualityComparer<TResult>.Default.Equals(selector(sourceItem, index)!, item))
                                     return index;
                             }
                         }

diff --git a/NetFabric.Hyperlinq/Quantifier/All/All.ArraySegment.cs b/NetFabric.Hyperlinq/Quantifier/All/All.ArraySegment.cs
@@ -15,10 +15,9 @@ public static bool All<TSource>(this in ArraySegment<TSource> source, Predicate<
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    foreach (var item in source.Array)
                     {
-                        if (!predicate(array![index]))
+                        if (!predicate(item))
                             return false;
                     }
                 }
@@ -47,11 +46,13 @@ public static bool All<TSource>(this in ArraySegment<TSource> source, PredicateA
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    var index = 0;
+                    foreach (var item in source.Array)
                     {
-                        if (!predicate(array![index], index))
+                        if (!predicate(item, index))
                             return false;
+
+                        index++;
                     }
                 }
                 else

diff --git a/NetFabric.Hyperlinq/Quantifier/Any/Any.ArraySegment.cs b/NetFabric.Hyperlinq/Quantifier/Any/Any.ArraySegment.cs
@@ -20,10 +20,9 @@ public static bool Any<TSource>(this in ArraySegment<TSource> source, Predicate<
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    foreach (var item in source.Array)
                     {
-                        if (predicate(array![index]))
+                        if (predicate(item))
                             return true;
                     }
                 }
@@ -51,11 +50,13 @@ public static bool Any<TSource>(this in ArraySegment<TSource> source, PredicateA
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    var index = 0;
+                    foreach (var item in source.Array)
                     {
-                        if (predicate(array![index], index))
+                        if (predicate(item, index))
                             return true;
+
+                        index++;
                     }
                 }
                 else

diff --git a/NetFabric.Hyperlinq/Quantifier/Contains/Contains.ArraySegment.cs b/NetFabric.Hyperlinq/Quantifier/Contains/Contains.ArraySegment.cs
@@ -13,10 +13,9 @@ public static partial class ArrayExtensions
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    foreach (var item in source.Array)
                     {
-                        if (EqualityComparer<TSource>.Default.Equals(array![index], value!))
+                        if (EqualityComparer<TSource>.Default.Equals(item, value!))
                             return true;
                     }
                 }
@@ -51,10 +50,9 @@ static bool DefaultContains(in ArraySegment<TSource> source, [AllowNull] TSource
                 {
                     if (source.IsWhole())
                     {
-                        var array = source.Array;
-                        for (var index = 0; index < array.Length; index++)
+                        foreach (var item in source.Array)
                         {
-                            if (EqualityComparer<TSource>.Default.Equals(array![index], value!))
+                            if (EqualityComparer<TSource>.Default.Equals(item, value!))
                                 return true;
                         }
                     }
@@ -78,10 +76,9 @@ static bool ComparerContains(in ArraySegment<TSource> source, [AllowNull] TSourc
                 {
                     if (source.IsWhole())
                     {
-                        var array = source.Array;
-                        for (var index = 0; index < array.Length; index++)
+                        foreach (var item in source.Array)
                         {
-                            if (comparer.Equals(array![index], value!))
+                            if (comparer.Equals(item, value!))
                                 return true;
                         }
                     }
@@ -117,10 +114,9 @@ static bool ValueContains(in ArraySegment<TSource> source, [AllowNull] TResult v
                 {
                     if (source.IsWhole())
                     {
-                        var array = source.Array;
-                        for (var index = 0; index < array.Length; index++)
+                        foreach (var item in source.Array)
                         {
-                            if (EqualityComparer<TResult>.Default.Equals(selector(array![index])!, value!))
+                            if (EqualityComparer<TResult>.Default.Equals(selector(item)!, value!))
                                 return true;
                         }
                     }
@@ -146,10 +142,9 @@ static bool ReferenceContains(in ArraySegment<TSource> source, [AllowNull] TResu
                 {
                     if (source.IsWhole())
                     {
-                        var array = source.Array;
-                        for (var index = 0; index < array.Length; index++)
+                        foreach (var item in source.Array)
                         {
-                            if (defaultComparer.Equals(selector(array![index])!, value!))
+                            if (defaultComparer.Equals(selector(item)!, value!))
                                 return true;
                         }
                     }
@@ -185,11 +180,13 @@ static bool ValueContains(in ArraySegment<TSource> source, [AllowNull] TResult v
                 {
                     if (source.IsWhole())
                     {
-                        var array = source.Array;
-                        for (var index = 0; index < array.Length; index++)
+                        var index = 0;
+                        foreach (var item in source.Array)
                         {
-                            if (EqualityComparer<TResult>.Default.Equals(selector(array![index], index)!, value!))
+                            if (EqualityComparer<TResult>.Default.Equals(selector(item, index)!, value!))
                                 return true;
+
+                            index++;
                         }
                     }
                     else
@@ -227,11 +224,13 @@ static bool ReferenceContains(in ArraySegment<TSource> source, [AllowNull] TResu
                 {
                     if (source.IsWhole())
                     {
-                        var array = source.Array;
-                        for (var index = 0; index < array.Length; index++)
+                        var index = 0;
+                        foreach (var item in source.Array)
                         {
-                            if (defaultComparer.Equals(selector(array![index], index)!, value!))
+                            if (defaultComparer.Equals(selector(item, index)!, value!))
                                 return true;
+
+                            index++;
                         }
                     }
                     else

diff --git a/NetFabric.Hyperlinq/Set/Distinct/Distinct.ArraySegment.cs b/NetFabric.Hyperlinq/Set/Distinct/Distinct.ArraySegment.cs
@@ -90,9 +90,8 @@ public void Dispose()
                 {
                     if (source.IsWhole())
                     {
-                        var array = source.Array;
-                        for (var index = 0; index < array.Length; index++)
-                            _ = set.Add(array![index]);
+                        foreach (var item in source.Array)
+                            _ = set.Add(item);
                     }
                     else
                     {

diff --git a/NetFabric.Hyperlinq/Utils/ArrayBuilder/ToArrayBuilder.ArraySegment.cs b/NetFabric.Hyperlinq/Utils/ArrayBuilder/ToArrayBuilder.ArraySegment.cs
@@ -16,10 +16,8 @@ static LargeArrayBuilder<TSource> ToArrayBuilder<TSource>(in ArraySegment<TSourc
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    foreach (var item in source.Array)
                     {
-                        var item = array![index];
                         if (predicate(item))
                             builder.Add(item);
                     }
@@ -49,12 +47,13 @@ static LargeArrayBuilder<TSource> ToArrayBuilder<TSource>(in ArraySegment<TSourc
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    var index = 0;
+                    foreach (var item in source.Array)
                     {
-                        var item = array![index];
                         if (predicate(item, index))
                             builder.Add(item);
+
+                        index++;
                     }
                 }
                 else
@@ -95,10 +94,8 @@ static LargeArrayBuilder<TSource> ToArrayBuilder<TSource>(in ArraySegment<TSourc
             {
                 if (source.IsWhole())
                 {
-                    var array = source.Array;
-                    for (var index = 0; index < array.Length; index++)
+                    foreach (var item in source.Array)
                     {
-                        var item = array![index];
                         if (predicate(item))
                             builder.Add(selector(item));
                     }