removed the need for InternalExtensions.cs

dragon7307 · dragon7307 · commit d043eb0970f7 · 2024-09-02T15:59:12.000+02:00
diff --git a/src/Enumerators/Split/SpanSplitStringSplitOptionsEnumerator.cs b/src/Enumerators/Split/SpanSplitStringSplitOptionsEnumerator.cs
@@ -27,10 +27,12 @@ public ref struct SpanSplitStringSplitOptionsEnumerator
         /// <param name="options">A bitwise combination of the enumeration values that specifies whether to trim results and include empty results.</param>
         public SpanSplitStringSplitOptionsEnumerator(ReadOnlySpan<char> source, char delimiter, StringSplitOptions options)
         {
+            ExceptionHelpers.ThrowIfInvalid(options, nameof(options));
+
             Span = source;
             Delimiter = delimiter;
-            TrimEntries = options.ThrowIfInvalid().IsTrimEntriesSet();
-            RemoveEmptyEntries = options.IsRemoveEmptyEntriesSet();
+            TrimEntries = options.HasFlag((StringSplitOptions)2); // StringSplitOptions.TrimEntries
+            RemoveEmptyEntries = options.HasFlag(StringSplitOptions.RemoveEmptyEntries);
             EnumerationDone = false;
             Current = default;
         }
diff --git a/src/Enumerators/Split/SpanSplitStringSplitOptionsWithCountEnumerator.cs b/src/Enumerators/Split/SpanSplitStringSplitOptionsWithCountEnumerator.cs
@@ -33,19 +33,16 @@ public SpanSplitStringSplitOptionsWithCountEnumerator(ReadOnlySpan<char> source,
         {
             ExceptionHelpers.ThrowIfNegative(count, nameof(count));
             ExceptionHelpers.ThrowIfInvalid(countExceedingBehaviour, nameof(countExceedingBehaviour));
+            ExceptionHelpers.ThrowIfInvalid(options, nameof(options));
+
             Span = source;
             Delimiter = delimiter;
-            CurrentCount = count;
-            TrimEntries = options.ThrowIfInvalid().IsTrimEntriesSet();
-            RemoveEmptyEntries = options.IsRemoveEmptyEntriesSet();
+            CurrentCount = count == 1 ? 0 : count;
+            TrimEntries = options.HasFlag((StringSplitOptions)2); // StringSplitOptions.TrimEntries
+            RemoveEmptyEntries = options.HasFlag(StringSplitOptions.RemoveEmptyEntries);
             CountExceedingBehaviour = countExceedingBehaviour;
             EnumerationDone = count == 0;
             Current = default;
-
-            if(count == 1) // special case
-            {
-                CurrentCount = 0;
-            }
         }
 
         /// <summary>
diff --git a/src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsEnumerator.cs b/src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsEnumerator.cs
@@ -27,10 +27,12 @@ public ref struct SpanSplitAnyStringSplitOptionsEnumerator
         /// <param name="options">A bitwise combination of the enumeration values that specifies whether to trim results and include empty results.</param>
         public SpanSplitAnyStringSplitOptionsEnumerator(ReadOnlySpan<char> source, ReadOnlySpan<char> delimiters, StringSplitOptions options)
         {
+            ExceptionHelpers.ThrowIfInvalid(options, nameof(options));
+
             Span = source;
             Delimiters = delimiters;
-            TrimEntries = options.ThrowIfInvalid().IsTrimEntriesSet();
-            RemoveEmptyEntries = options.IsRemoveEmptyEntriesSet();
+            TrimEntries = options.HasFlag((StringSplitOptions)2); // StringSplitOptions.TrimEntries
+            RemoveEmptyEntries = options.HasFlag(StringSplitOptions.RemoveEmptyEntries);
             EnumerationDone = false;
             Current = default;
         }
diff --git a/src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsWithCountEnumerator.cs b/src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsWithCountEnumerator.cs
@@ -33,19 +33,16 @@ public SpanSplitAnyStringSplitOptionsWithCountEnumerator(ReadOnlySpan<char> sour
         {
             ExceptionHelpers.ThrowIfNegative(count, nameof(count));
             ExceptionHelpers.ThrowIfInvalid(countExceedingBehaviour, nameof(countExceedingBehaviour));
+            ExceptionHelpers.ThrowIfInvalid(options, nameof(options));
+
             Span = source;
             Delimiters = delimiters;
-            CurrentCount = count;
-            TrimEntries = options.ThrowIfInvalid().IsTrimEntriesSet();
-            RemoveEmptyEntries = options.IsRemoveEmptyEntriesSet();
+            CurrentCount = count == 1 ? 0 : count;
+            TrimEntries = options.HasFlag((StringSplitOptions)2); // StringSplitOptions.TrimEntries
+            RemoveEmptyEntries = options.HasFlag(StringSplitOptions.RemoveEmptyEntries);
             CountExceedingBehaviour = countExceedingBehaviour;
             EnumerationDone = count == 0;
             Current = default;
-
-            if(count == 1) // special case
-            {
-                CurrentCount = 0;
-            }
         }
 
         /// <summary>
diff --git a/src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsEnumerator.cs b/src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsEnumerator.cs
@@ -28,12 +28,14 @@ public ref struct SpanSplitSequenceStringSplitOptionsEnumerator
         /// <param name="options">A bitwise combination of the enumeration values that specifies whether to trim results and include empty results.</param>
         public SpanSplitSequenceStringSplitOptionsEnumerator(ReadOnlySpan<char> source, ReadOnlySpan<char> delimiter, StringSplitOptions options)
         {
+            ExceptionHelpers.ThrowIfInvalid(options, nameof(options));
+
             Span = source;
             Delimiter = delimiter;
             DelimiterLength = Delimiter.Length;
             DelimiterIsEmpty = Delimiter.IsEmpty;
-            TrimEntries = options.ThrowIfInvalid().IsTrimEntriesSet();
-            RemoveEmptyEntries = options.IsRemoveEmptyEntriesSet();
+            TrimEntries = options.HasFlag((StringSplitOptions)2); // StringSplitOptions.TrimEntries
+            RemoveEmptyEntries = options.HasFlag(StringSplitOptions.RemoveEmptyEntries);
             EnumerationDone = false;
             Current = default;
         }
diff --git a/src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsWithCountEnumerator.cs b/src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsWithCountEnumerator.cs
@@ -34,21 +34,18 @@ public SpanSplitSequenceStringSplitOptionsWithCountEnumerator(ReadOnlySpan<char>
         {
             ExceptionHelpers.ThrowIfNegative(count, nameof(count));
             ExceptionHelpers.ThrowIfInvalid(countExceedingBehaviour, nameof(countExceedingBehaviour));
+            ExceptionHelpers.ThrowIfInvalid(options, nameof(options));
+
             Span = source;
             Delimiter = delimiter;
             DelimiterLength = Delimiter.Length;
             DelimiterIsEmpty = Delimiter.IsEmpty;
-            CurrentCount = DelimiterIsEmpty ? 0 : count;
-            TrimEntries = options.ThrowIfInvalid().IsTrimEntriesSet();
-            RemoveEmptyEntries = options.IsRemoveEmptyEntriesSet();
+            CurrentCount = DelimiterIsEmpty || count == 1 ? 0 : count;
+            TrimEntries = options.HasFlag((StringSplitOptions)2); // StringSplitOptions.TrimEntries
+            RemoveEmptyEntries = options.HasFlag(StringSplitOptions.RemoveEmptyEntries);
             CountExceedingBehaviour = countExceedingBehaviour;
             EnumerationDone = count == 0;
             Current = default;
-
-            if(count == 1) // special case
-            {
-                CurrentCount = 0;
-            }
         }
 
         /// <summary>
diff --git a/src/ExceptionHelpers.cs b/src/ExceptionHelpers.cs
@@ -7,6 +7,25 @@
 
 static class ExceptionHelpers
 {
+    static readonly StringSplitOptions NegatedCombinationOfAllValidStringSplitOptions;
+
+    static ExceptionHelpers()
+    {
+#if NET5_0_OR_GREATER
+        StringSplitOptions[] flags = Enum.GetValues<StringSplitOptions>();
+#else
+        StringSplitOptions[] flags = (StringSplitOptions[])Enum.GetValues(typeof(StringSplitOptions));
+#endif
+
+        int combination = 0;
+        foreach(int flag in flags)
+        {
+            combination |= flag;
+        }
+
+        NegatedCombinationOfAllValidStringSplitOptions = (StringSplitOptions) ~combination;
+    }
+
     internal static void ThrowIfGreaterThanOrEqual<T>(T value, T other,
 #if NET8_0_OR_GREATER
         [CallerArgumentExpression(nameof(value))] 
@@ -51,6 +70,18 @@ internal static void ThrowIfInvalid(CountExceedingBehaviour countExceedingBehavi
         }
     }
 
+    internal static void ThrowIfInvalid(this StringSplitOptions options,
+#if NET8_0_OR_GREATER
+        [CallerArgumentExpression(nameof(options))] 
+#endif
+    string? paramName = null)
+    {
+        if((options & NegatedCombinationOfAllValidStringSplitOptions) != 0)
+        {
+            throw new ArgumentException("Value of flag is invalid.", paramName);
+        }
+    }
+
     internal static void ThrowIfOutOfBounds<T>(T value, T lowerBound, T upperBound,
 #if NET8_0_OR_GREATER
         [CallerArgumentExpression(nameof(value))] 
diff --git a/src/Extensions/ReadOnlySpan/Linq/Where.cs b/src/Extensions/ReadOnlySpan/Linq/Where.cs
diff --git a/src/Extensions/Span/Linq/Where.cs b/src/Extensions/Span/Linq/Where.cs
diff --git a/src/InternalExtensions.cs b/src/InternalExtensions.cs
diff --git a/tests/unit-tests/Tests/ReadOnlySpan/Split/SplitAny_StringSplitOptions/Tests.cs b/tests/unit-tests/Tests/ReadOnlySpan/Split/SplitAny_StringSplitOptions/Tests.cs
@@ -101,7 +101,7 @@ public void DelimiterAtTheStartWithRemoveEmptyEntriesOptionResultInNoEmptySpan(S
                 ReadOnlySpan<char> source = "baa";
 
                 char[][] expected = [['a', 'a']];
-                
+
                 var actual = source.SplitAny(['b', 'c'], options).ToSystemEnumerable();
 
                 AssertEqual(expected, actual);
diff --git a/tests/unit-tests/Tests/ReadOnlySpan/Split/Split_StringSplitOptions/Tests.cs b/tests/unit-tests/Tests/ReadOnlySpan/Split/Split_StringSplitOptions/Tests.cs
@@ -185,7 +185,7 @@ public void TrimEntriesOptionTrimsEverySpan()
                 ReadOnlySpan<char> source = " a\tb\na\r";
 
                 char[][] expected = [['a'], ['a']];
-               
+
                 var actual = source.Split('b', StringSplitOptions.TrimEntries).ToSystemEnumerable();
 
                 AssertEqual(expected, actual);
