[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed and optimized split methods #11

Merged
merged 14 commits into from
Sep 1, 2024
Merged

Fixed and optimized split methods #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d22f546
fixed and optimized split methods
Guiorgy Jan 28, 2024
c41ff07
RemoveEmptyEntries on CutLastElements too
Guiorgy Feb 4, 2024
ab472d2
use ArgumentException instead of a custom exception
Guiorgy Jan 28, 2024
68d321b
renamed CountExceedingBehaviour options
Guiorgy Jan 28, 2024
8bb8994
handle cases where count is 0 or negative
Guiorgy Feb 5, 2024
30c8739
handle count equals 1 and RemoveEmptyEntries set
Guiorgy Feb 5, 2024
8453e23
reordered parameter comments
Guiorgy Feb 5, 2024
3993f24
simplified checking for StringSplitOptions flags
Guiorgy Feb 7, 2024
c9d777d
simplified checking for CountExceedingBehaviour value
Guiorgy Feb 7, 2024
2d377c0
fixed edge case when delimiter length is 0
Guiorgy Feb 19, 2024
0de00ad
Silence warnings
Guiorgy Feb 24, 2024
a46a4cc
removed unnecessary cast
Guiorgy Feb 24, 2024
591df77
throw if StringSplitOptions is invalid
Guiorgy Feb 24, 2024
25a53a8
renamed CountExceedingBehaviour options
Guiorgy Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
handle count equals 1 and RemoveEmptyEntries set
  • Loading branch information
@Guiorgy
Guiorgy committed Feb 5, 2024
commit 30c8739630ae00a56c56e47bd78dcef974ef9ddf
9 changes: 7 additions & 2 deletions src/Enumerators/Split/SpanSplitStringSplitOptionsWithCountEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ public SpanSplitStringSplitOptionsWithCountEnumerator(ReadOnlySpan<char> source,
CountExceedingBehaviour = countExceedingBehaviour.ThrowIfInvalid();
EnumerationDone = count == 0;
Current = default;

if(count == 1) // special case
{
CurrentCount = 0;
}
}

/// <summary>
Expand All @@ -68,11 +73,11 @@ public bool MoveNext()
{
int delimiterIndex = Span.IndexOf(Delimiter);

if(delimiterIndex == -1 || CurrentCount == 1)
if(delimiterIndex == -1 || CurrentCount <= 1)
{
EnumerationDone = true;

if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
if(CurrentCount != 0 && delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
{
do
{
Expand Down
9 changes: 7 additions & 2 deletions src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsWithCountEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ public SpanSplitAnyStringSplitOptionsWithCountEnumerator(ReadOnlySpan<char> sour
CountExceedingBehaviour = countExceedingBehaviour.ThrowIfInvalid();
EnumerationDone = count == 0;
Current = default;

if(count == 1) // special case
{
CurrentCount = 0;
}
}

/// <summary>
Expand All @@ -68,11 +73,11 @@ public bool MoveNext()
{
int delimiterIndex = Span.IndexOfAny(Delimiters);

if(delimiterIndex == -1 || CurrentCount == 1)
if(delimiterIndex == -1 || CurrentCount <= 1)
{
EnumerationDone = true;

if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
if(CurrentCount != 0 && delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
{
do
{
Expand Down
9 changes: 7 additions & 2 deletions src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsWithCountEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ public SpanSplitSequenceStringSplitOptionsWithCountEnumerator(ReadOnlySpan<char>
CountExceedingBehaviour = countExceedingBehaviour.ThrowIfInvalid();
EnumerationDone = count == 0;
Current = default;

if(count == 1) // special case
{
CurrentCount = 0;
}
}

/// <summary>
Expand All @@ -69,11 +74,11 @@ public bool MoveNext()
{
int delimiterIndex = Span.IndexOf(Delimiter);

if(delimiterIndex == -1 || CurrentCount == 1)
if(delimiterIndex == -1 || CurrentCount <= 1)
{
EnumerationDone = true;

if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
if(CurrentCount != 0 && delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
{
do
{
Expand Down