-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Add whitespace handling methods to MemoryExtensions #111439
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.
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
Open
AlexRadch
wants to merge
10
commits into
dotnet:main
Choose a base branch
from
AlexRadch:MemoryExtensions.WhiteSpace
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+316
−9
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b35693b
Add whitespace handling methods to MemoryExtensions
AlexRadch ad80463
Remove unused TestUtilities import in tests
AlexRadch e4069c1
Tests bugs have been fixed.
AlexRadch b495165
Apply suggestions from code review
AlexRadch 3f77a0f
Suggestions from code review
AlexRadch 866b91d
Remove unused namespaces in SearchValues.cs
AlexRadch bb9f9f4
Replaced references to `SearchValues.WhiteSpaces` with
AlexRadch 5b45997
Remove unused using directive in MemoryExtensions
AlexRadch 955d795
Merge branch 'main' into MemoryExtensions.WhiteSpace
jeffhandley 8b8e577
Apply suggestion from @PranavSenthilnathan
AlexRadch File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
261 changes: 261 additions & 0 deletions
261
src/libraries/System.Memory/tests/ReadOnlySpan/WhiteSpace.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,261 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
|
|
||
| using System.Collections.Generic; | ||
| using System.Runtime.InteropServices; | ||
| using Xunit; | ||
|
|
||
| namespace System.SpanTests | ||
| { | ||
| public static partial class ReadOnlySpanTests | ||
| { | ||
| [Fact] | ||
| public static void IsWhiteSpace_True() | ||
| { | ||
| Assert.True(Span<char>.Empty.IsWhiteSpace()); | ||
|
|
||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| Assert.True(CollectionsMarshal.AsSpan(chars).IsWhiteSpace()); | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void IsWhiteSpace_False() | ||
| { | ||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| var index = chars.Count; | ||
| chars.AddRange(chars.ToArray()); | ||
| chars.Insert(index, ' '); | ||
| var span = CollectionsMarshal.AsSpan(chars); | ||
|
|
||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (!char.IsWhiteSpace((char)i)) | ||
| { | ||
| chars[index] = (char)i; | ||
| Assert.False(span.IsWhiteSpace()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void ContainsAnyWhiteSpace_Found() | ||
| { | ||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (!char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| var index = chars.Count; | ||
| chars.AddRange(chars.ToArray()); | ||
| chars.Insert(index, ' '); | ||
| var span = CollectionsMarshal.AsSpan(chars); | ||
|
|
||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (char.IsWhiteSpace((char)i)) | ||
| { | ||
| chars[index] = (char)i; | ||
| Assert.True(span.ContainsAnyWhiteSpace()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void ContainsAnyWhiteSpace_NotFound() | ||
| { | ||
| Assert.False(Span<char>.Empty.ContainsAnyWhiteSpace()); | ||
|
|
||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (!char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| Assert.False(CollectionsMarshal.AsSpan(chars).ContainsAnyWhiteSpace()); | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void IndexOfAnyWhiteSpace_Found() | ||
| { | ||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (!char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| var index = chars.Count; | ||
| chars.AddRange(chars.ToArray()); | ||
| chars.Insert(index, ' '); | ||
| chars.Insert(index, ' '); | ||
| var span = CollectionsMarshal.AsSpan(chars); | ||
|
|
||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (char.IsWhiteSpace((char)i)) | ||
| { | ||
| chars[index] = (char)i; | ||
| chars[index + 1] = (char)i; | ||
| Assert.Equal(index, span.IndexOfAnyWhiteSpace()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void IndexOfAnyWhiteSpace_NotFound() | ||
| { | ||
| Assert.Equal(-1, Span<char>.Empty.IndexOfAnyWhiteSpace()); | ||
|
|
||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (!char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| Assert.Equal(-1, CollectionsMarshal.AsSpan(chars).IndexOfAnyWhiteSpace()); | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void IndexOfAnyExceptWhiteSpace_Found() | ||
| { | ||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| var index = chars.Count; | ||
| chars.AddRange(chars.ToArray()); | ||
| chars.Insert(index, ' '); | ||
| chars.Insert(index, ' '); | ||
| var span = CollectionsMarshal.AsSpan(chars); | ||
|
|
||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (!char.IsWhiteSpace((char)i)) | ||
| { | ||
| chars[index] = (char)i; | ||
| chars[index + 1] = (char)i; | ||
| Assert.Equal(index, span.IndexOfAnyExceptWhiteSpace()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void IndexOfAnyExceptWhiteSpace_NotFound() | ||
| { | ||
| Assert.Equal(-1, Span<char>.Empty.IndexOfAnyExceptWhiteSpace()); | ||
|
|
||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| Assert.Equal(-1, CollectionsMarshal.AsSpan(chars).IndexOfAnyExceptWhiteSpace()); | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void LastIndexOfAnyWhiteSpace_Found() | ||
| { | ||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (!char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| var index = chars.Count; | ||
| chars.AddRange(chars.ToArray()); | ||
| chars.Insert(index, ' '); | ||
| chars.Insert(index, ' '); | ||
| var span = CollectionsMarshal.AsSpan(chars); | ||
|
|
||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (char.IsWhiteSpace((char)i)) | ||
| { | ||
| chars[index] = (char)i; | ||
| chars[index + 1] = (char)i; | ||
| Assert.Equal(index + 1, span.LastIndexOfAnyWhiteSpace()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void LastIndexOfAnyWhiteSpace_NotFound() | ||
| { | ||
| Assert.Equal(-1, Span<char>.Empty.LastIndexOfAnyWhiteSpace()); | ||
|
|
||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (!char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| Assert.Equal(-1, CollectionsMarshal.AsSpan(chars).LastIndexOfAnyWhiteSpace()); | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void LastIndexOfAnyExceptWhiteSpace_Found() | ||
| { | ||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| var index = chars.Count; | ||
| chars.AddRange(chars.ToArray()); | ||
| chars.Insert(index, ' '); | ||
| chars.Insert(index, ' '); | ||
| var span = CollectionsMarshal.AsSpan(chars); | ||
|
|
||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (!char.IsWhiteSpace((char)i)) | ||
| { | ||
| chars[index] = (char)i; | ||
| chars[index + 1] = (char)i; | ||
| Assert.Equal(index + 1, span.LastIndexOfAnyExceptWhiteSpace()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public static void LastIndexOfAnyExceptWhiteSpace_NotFound() | ||
| { | ||
| Assert.Equal(-1, Span<char>.Empty.LastIndexOfAnyExceptWhiteSpace()); | ||
|
|
||
| List<char> chars = []; | ||
| for (int i = 0; i <= char.MaxValue; i++) | ||
| { | ||
| if (char.IsWhiteSpace((char)i)) | ||
| chars.Add((char)i); | ||
| } | ||
|
|
||
| Assert.Equal(-1, CollectionsMarshal.AsSpan(chars).LastIndexOfAnyExceptWhiteSpace()); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,15 +14,9 @@ public static partial class MemoryExtensions | |
| /// <summary> | ||
| /// Indicates whether the specified span contains only white-space characters. | ||
| /// </summary> | ||
| public static bool IsWhiteSpace(this ReadOnlySpan<char> span) | ||
| { | ||
| for (int i = 0; i < span.Length; i++) | ||
| { | ||
| if (!char.IsWhiteSpace(span[i])) | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In don't think these trivial methods require |
||
| public static bool IsWhiteSpace(this ReadOnlySpan<char> span) => | ||
| !string.SearchValuesStorage.WhiteSpaceChars.ContainsAnyExcept(span); | ||
|
|
||
| /// <summary> | ||
| /// Returns a value indicating whether the specified <paramref name="value"/> occurs within the <paramref name="span"/>. | ||
|
|
@@ -35,6 +29,16 @@ public static bool Contains(this ReadOnlySpan<char> span, ReadOnlySpan<char> val | |
| return IndexOf(span, value, comparisonType) >= 0; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Indicates whether the specified span contains <see cref="char.IsWhiteSpace(char)">any | ||
| /// white-space characters</see>. | ||
| /// </summary> | ||
| /// <param name="span">The source span.</param> | ||
AlexRadch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /// <returns><see langword="true"/> if the span contains any whitespace characters, <see langword="false"/> otherwise.</returns> | ||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
AlexRadch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| public static bool ContainsAnyWhiteSpace(this ReadOnlySpan<char> span) => | ||
| string.SearchValuesStorage.WhiteSpaceChars.ContainsAny(span); | ||
|
|
||
| /// <summary> | ||
| /// Determines whether this <paramref name="span"/> and the specified <paramref name="other"/> span have the same characters | ||
| /// when compared using the specified <paramref name="comparisonType"/> option. | ||
|
|
@@ -149,6 +153,24 @@ public static int IndexOf(this ReadOnlySpan<char> span, ReadOnlySpan<char> value | |
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Reports the zero-based index of the first occurrence of <see cref="char.IsWhiteSpace(char)">any white-space | ||
| /// characters</see> in the current <paramref name="span"/>, or -1 if not founded. | ||
| /// </summary> | ||
| /// <param name="span">The source span.</param> | ||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public static int IndexOfAnyWhiteSpace(this ReadOnlySpan<char> span) => | ||
| string.SearchValuesStorage.WhiteSpaceChars.IndexOfAny(span); | ||
|
|
||
| /// <summary> | ||
| /// Reports the zero-based index of the first occurrence of <see cref="char.IsWhiteSpace(char)">any | ||
| /// non-white-space characters</see> in the current <paramref name="span"/>, or -1 if not founded. | ||
| /// </summary> | ||
| /// <param name="span">The source span.</param> | ||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public static int IndexOfAnyExceptWhiteSpace(this ReadOnlySpan<char> span) => | ||
| string.SearchValuesStorage.WhiteSpaceChars.IndexOfAnyExcept(span); | ||
|
|
||
| /// <summary> | ||
| /// Reports the zero-based index of the last occurrence of the specified <paramref name="value"/> in the current <paramref name="span"/>. | ||
| /// </summary> | ||
|
|
@@ -184,6 +206,24 @@ ref MemoryMarshal.GetReference(value), | |
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Reports the zero-based index of the last occurrence of <see cref="char.IsWhiteSpace(char)">any white-space | ||
| /// characters</see> in the current <paramref name="span"/>, or -1 if not founded. | ||
| /// </summary> | ||
| /// <param name="span">The source span.</param> | ||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public static int LastIndexOfAnyWhiteSpace(this ReadOnlySpan<char> span) => | ||
| string.SearchValuesStorage.WhiteSpaceChars.LastIndexOfAny(span); | ||
|
|
||
| /// <summary> | ||
| /// Reports the zero-based index of the last occurrence of <see cref="char.IsWhiteSpace(char)">any | ||
| /// non-white-space characters</see> in the current <paramref name="span"/>, or -1 if not founded. | ||
| /// </summary> | ||
| /// <param name="span">The source span.</param> | ||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public static int LastIndexOfAnyExceptWhiteSpace(this ReadOnlySpan<char> span) => | ||
| string.SearchValuesStorage.WhiteSpaceChars.LastIndexOfAnyExcept(span); | ||
|
|
||
| /// <summary> | ||
| /// Copies the characters from the source span into the destination, converting each character to lowercase, | ||
| /// using the casing rules of the specified culture. | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.