simplified checking for CountExceedingBehaviour value

Guiorgy · Guiorgy · commit c9d777d66802 · 2024-02-07T20:45:36.000+04:00
diff --git a/src/CountExceedingBehaviour.cs b/src/CountExceedingBehaviour.cs
@@ -54,5 +54,25 @@ public static CountExceedingBehaviour ThrowIfInvalid(this CountExceedingBehaviou
 
             return countExceedingBehaviour;
         }
+
+        /// <summary>
+        /// Determines whether the current instance is <see cref="CountExceedingBehaviour.IncludeRemainingElements"/>.
+        /// </summary>
+        /// <param name="countExceedingBehaviour">The <see cref="CountExceedingBehaviour"/> instance to test.</param>
+        /// <returns><see langword="true"/> if <paramref name="countExceedingBehaviour"/> is <see cref="CountExceedingBehaviour.IncludeRemainingElements"/>; <see langword="false"/> otherwise.</returns>
+        public static bool IsIncludeRemainingElements(this CountExceedingBehaviour countExceedingBehaviour)
+        {
+            return countExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements;
+        }
+
+        /// <summary>
+        /// Determines whether the current instance is <see cref="CountExceedingBehaviour.DropRemainingElements"/>.
+        /// </summary>
+        /// <param name="countExceedingBehaviour">The <see cref="CountExceedingBehaviour"/> instance to test.</param>
+        /// <returns><see langword="true"/> if <paramref name="countExceedingBehaviour"/> is <see cref="CountExceedingBehaviour.DropRemainingElements"/>; <see langword="false"/> otherwise.</returns>
+        public static bool IsDropRemainingElements(this CountExceedingBehaviour countExceedingBehaviour)
+        {
+            return countExceedingBehaviour == CountExceedingBehaviour.DropRemainingElements;
+        }
     }
 }
diff --git a/src/Enumerators/Split/SpanSplitStringSplitOptionsWithCountEnumerator.cs b/src/Enumerators/Split/SpanSplitStringSplitOptionsWithCountEnumerator.cs
@@ -87,7 +87,7 @@ public bool MoveNext()
                                 continue;
                             }
 
-                            if(CountExceedingBehaviour == CountExceedingBehaviour.DropRemainingElements)
+                            if(CountExceedingBehaviour.IsDropRemainingElements())
                             {
                                 Span = beforeDelimiter;
                             }
@@ -99,7 +99,7 @@ public bool MoveNext()
                     }
                     else
                     {
-                        Current = delimiterIndex == -1 || CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];
+                        Current = delimiterIndex == -1 || CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];
                     }
 
                     if(TrimEntries)
diff --git a/src/Enumerators/Split/SpanSplitWithCountEnumerator.cs b/src/Enumerators/Split/SpanSplitWithCountEnumerator.cs
@@ -62,7 +62,7 @@ public bool MoveNext()
             {
                 EnumerationDone = true;
 
-                Current = delimiterIndex == -1 || CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];
+                Current = delimiterIndex == -1 || CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];
 
                 return true;
             }
diff --git a/src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsWithCountEnumerator.cs b/src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsWithCountEnumerator.cs
@@ -87,7 +87,7 @@ public bool MoveNext()
                                 continue;
                             }
 
-                            if(CountExceedingBehaviour == CountExceedingBehaviour.DropRemainingElements)
+                            if(CountExceedingBehaviour.IsDropRemainingElements())
                             {
                                 Span = beforeDelimiter;
                             }
@@ -99,7 +99,7 @@ public bool MoveNext()
                     }
                     else
                     {
-                        Current = delimiterIndex == -1 || CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];
+                        Current = delimiterIndex == -1 || CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];
                     }
 
                     if(TrimEntries)
diff --git a/src/Enumerators/SplitAny/SpanSplitAnyWithCountEnumerator.cs b/src/Enumerators/SplitAny/SpanSplitAnyWithCountEnumerator.cs
@@ -62,7 +62,7 @@ public bool MoveNext()
             {
                 EnumerationDone = true;
 
-                Current = delimiterIndex == -1 || CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];
+                Current = delimiterIndex == -1 || CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];
 
                 return true;
             }
diff --git a/src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsWithCountEnumerator.cs b/src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsWithCountEnumerator.cs
@@ -88,7 +88,7 @@ public bool MoveNext()
                                 continue;
                             }
 
-                            if(CountExceedingBehaviour == CountExceedingBehaviour.DropRemainingElements)
+                            if(CountExceedingBehaviour.IsDropRemainingElements())
                             {
                                 Span = beforeDelimiter;
                             }
@@ -100,7 +100,7 @@ public bool MoveNext()
                     }
                     else
                     {
-                        Current = delimiterIndex == -1 || CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];
+                        Current = delimiterIndex == -1 || CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];
                     }
 
                     if(TrimEntries)
diff --git a/src/Enumerators/SplitSequence/SpanSplitSequenceWithCountEnumerator.cs b/src/Enumerators/SplitSequence/SpanSplitSequenceWithCountEnumerator.cs
@@ -63,7 +63,7 @@ public bool MoveNext()
             {
                 EnumerationDone = true;
 
-                Current = delimiterIndex == -1 || CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];
+                Current = delimiterIndex == -1 || CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];
 
                 return true;
             }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public bool MoveNext()`
`87`	`87`	`continue;`
`88`	`88`	`}`
`89`	`89`
`90`		`- if(CountExceedingBehaviour == CountExceedingBehaviour.DropRemainingElements)`
	`90`	`+ if(CountExceedingBehaviour.IsDropRemainingElements())`
`91`	`91`	`{`
`92`	`92`	`Span = beforeDelimiter;`
`93`	`93`	`}`
`@@ -99,7 +99,7 @@ public bool MoveNext()`
`99`	`99`	`}`
`100`	`100`	`else`
`101`	`101`	`{`
`102`		`- Current = delimiterIndex == -1 \|\| CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];`
	`102`	`+ Current = delimiterIndex == -1 \|\| CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if(TrimEntries)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public bool MoveNext()`
`62`	`62`	`{`
`63`	`63`	`EnumerationDone = true;`
`64`	`64`
`65`		`- Current = delimiterIndex == -1 \|\| CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];`
	`65`	`+ Current = delimiterIndex == -1 \|\| CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];`
`66`	`66`
`67`	`67`	`return true;`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public bool MoveNext()`
`88`	`88`	`continue;`
`89`	`89`	`}`
`90`	`90`
`91`		`- if(CountExceedingBehaviour == CountExceedingBehaviour.DropRemainingElements)`
	`91`	`+ if(CountExceedingBehaviour.IsDropRemainingElements())`
`92`	`92`	`{`
`93`	`93`	`Span = beforeDelimiter;`
`94`	`94`	`}`
`@@ -100,7 +100,7 @@ public bool MoveNext()`
`100`	`100`	`}`
`101`	`101`	`else`
`102`	`102`	`{`
`103`		`- Current = delimiterIndex == -1 \|\| CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];`
	`103`	`+ Current = delimiterIndex == -1 \|\| CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`if(TrimEntries)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public bool MoveNext()`
`63`	`63`	`{`
`64`	`64`	`EnumerationDone = true;`
`65`	`65`
`66`		`- Current = delimiterIndex == -1 \|\| CountExceedingBehaviour == CountExceedingBehaviour.IncludeRemainingElements ? Span : Span[..delimiterIndex];`
	`66`	`+ Current = delimiterIndex == -1 \|\| CountExceedingBehaviour.IsIncludeRemainingElements() ? Span : Span[..delimiterIndex];`
`67`	`67`
`68`	`68`	`return true;`
`69`	`69`	`}`