Add IndexOfAnyValues.Contains#78996

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

Merged
MihaZupan merged 2 commits into from
Nov 30, 2022
Merged

Add IndexOfAnyValues.Contains #78996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ac5920
Add IndexOfAnyValues.Contains
MihaZupan Nov 29, 2022
013fa36
Unsafe => unsafe
MihaZupan Nov 30, 2022
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
5 changes: 2 additions & 3 deletions src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ internal sealed partial class TypeNameParser : IDisposable

#region Private Data Members
private readonly SafeTypeNameParserHandle m_NativeParser;
private const string SpecialChars = ",[]&*+\\"; // see typeparse.h
private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(SpecialChars);
private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(",[]&*+\\"); // see typeparse.h
#endregion

#region Constructor and Disposer
Expand DownExpand Up@@ -289,7 +288,7 @@ private static string EscapeTypeName(string name)

foreach (char c in name.AsSpan(specialCharIndex))
{
if (SpecialChars.Contains(c))
if (s_specialChars.Contains(c))
sb.Append('\\');

sb.Append(c);
Expand Down
67 changes: 0 additions & 67 deletions src/libraries/System.Memory/tests/Span/IndexOfAny.byte.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -530,73 +530,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Byte()
}
}

[Fact]
[OuterLoop("Takes about a second to execute")]
public static void TestIndexOfAny_RandomInputs_Byte()
{
IndexOfAnyCharTestHelper.TestRandomInputs(
expected: IndexOfAnyReferenceImpl,
indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

static int IndexOfAnyReferenceImpl(ReadOnlySpan<byte> searchSpace, ReadOnlySpan<byte> values)
{
for (int i = 0; i < searchSpace.Length; i++)
{
if (values.Contains(searchSpace[i]))
{
return i;
}
}

return -1;
}
}

[Theory]
[InlineData(true)]
[InlineData(false)]
public static void AsciiNeedle_ProperlyHandlesEdgeCases_Byte(bool needleContainsZero)
{
// There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
ReadOnlySpan<byte> needleValues = needleContainsZero ? "AEIOU\0"u8 : "AEIOU!"u8;
IndexOfAnyValues<byte> needle = IndexOfAnyValues.Create(needleValues);

ReadOnlySpan<byte> repeatingHaystack = "AaAaAaAaAaAa"u8;
Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

ReadOnlySpan<byte> haystackWithZeroes = "Aa\0Aa\0Aa\0"u8;
Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

Span<byte> haystackWithOffsetNeedle = new byte[100];
for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
{
haystackWithOffsetNeedle[i] = (byte)(128 + needleValues[i % needleValues.Length]);
}

Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

// Mix matching characters back in
for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
{
haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
}

Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
}

private static int IndexOf(Span<byte> span, byte value)
{
int index = span.IndexOf(value);
Expand Down
203 changes: 0 additions & 203 deletions src/libraries/System.Memory/tests/Span/IndexOfAny.char.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System.Buffers;
using System.Linq;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Xunit;

namespace System.SpanTests
Expand DownExpand Up@@ -776,95 +773,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Char()
}
}

[Fact]
[OuterLoop("Takes about a second to execute")]
public static void TestIndexOfAny_RandomInputs_Char()
{
IndexOfAnyCharTestHelper.TestRandomInputs(
expected: IndexOfAnyReferenceImpl,
indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

static int IndexOfAnyReferenceImpl(ReadOnlySpan<char> searchSpace, ReadOnlySpan<char> values)
{
for (int i = 0; i < searchSpace.Length; i++)
{
if (values.Contains(searchSpace[i]))
{
return i;
}
}

return -1;
}
}

[Theory]
[InlineData(true)]
[InlineData(false)]
public static void AsciiNeedle_ProperlyHandlesEdgeCases_Char(bool needleContainsZero)
{
// There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
ReadOnlySpan<char> needleValues = needleContainsZero ? "AEIOU\0" : "AEIOU!";
IndexOfAnyValues<char> needle = IndexOfAnyValues.Create(needleValues);

ReadOnlySpan<char> repeatingHaystack = "AaAaAaAaAaAa";
Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

ReadOnlySpan<char> haystackWithZeroes = "Aa\0Aa\0Aa\0";
Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

Span<char> haystackWithOffsetNeedle = new char[100];
for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
{
haystackWithOffsetNeedle[i] = (char)(128 + needleValues[i % needleValues.Length]);
}

Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

// Mix matching characters back in
for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
{
haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
}

Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

// With chars, the lower byte could be matching, but we have to check that the higher byte is also 0
for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
{
haystackWithOffsetNeedle[i] = (char)(((i + 1) * 256) + needleValues[i % needleValues.Length]);
}

Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

// Mix matching characters back in
for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
{
haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
}

Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
}

private static int IndexOf(Span<char> span, char value)
{
int index = span.IndexOf(value);
Expand DownExpand Up@@ -893,115 +801,4 @@ private static int IndexOfAny(Span<char> span, ReadOnlySpan<char> values)
return index;
}
}

public static class IndexOfAnyCharTestHelper
{
private const int MaxNeedleLength = 10;
private const int MaxHaystackLength = 40;

private static readonly char[] s_randomAsciiChars;
private static readonly char[] s_randomLatin1Chars;
private static readonly char[] s_randomChars;
private static readonly byte[] s_randomAsciiBytes;
private static readonly byte[] s_randomBytes;

static IndexOfAnyCharTestHelper()
{
s_randomAsciiChars = new char[100 * 1024];
s_randomLatin1Chars = new char[100 * 1024];
s_randomChars = new char[1024 * 1024];
s_randomBytes = new byte[100 * 1024];

var rng = new Random(42);

for (int i = 0; i < s_randomAsciiChars.Length; i++)
{
s_randomAsciiChars[i] = (char)rng.Next(0, 128);
}

for (int i = 0; i < s_randomLatin1Chars.Length; i++)
{
s_randomLatin1Chars[i] = (char)rng.Next(0, 256);
}

rng.NextBytes(MemoryMarshal.Cast<char, byte>(s_randomChars));

s_randomAsciiBytes = Encoding.ASCII.GetBytes(s_randomAsciiChars);

rng.NextBytes(s_randomBytes);
}

public delegate int IndexOfAnySearchDelegate<T>(ReadOnlySpan<T> searchSpace, ReadOnlySpan<T> values) where T : IEquatable<T>?;

public delegate int IndexOfAnyValuesSearchDelegate<T>(ReadOnlySpan<T> searchSpace, IndexOfAnyValues<T> values) where T : IEquatable<T>?;

public static void TestRandomInputs(IndexOfAnySearchDelegate<byte> expected, IndexOfAnySearchDelegate<byte> indexOfAny, IndexOfAnyValuesSearchDelegate<byte> indexOfAnyValues)
{
var rng = new Random(42);

for (int iterations = 0; iterations < 1_000_000; iterations++)
{
// There are more interesting corner cases with ASCII needles, test those more.
Test(rng, s_randomBytes, s_randomAsciiBytes, expected, indexOfAny, indexOfAnyValues);

Test(rng, s_randomBytes, s_randomBytes, expected, indexOfAny, indexOfAnyValues);
}
}

public static void TestRandomInputs(IndexOfAnySearchDelegate<char> expected, IndexOfAnySearchDelegate<char> indexOfAny, IndexOfAnyValuesSearchDelegate<char> indexOfAnyValues)
{
var rng = new Random(42);

for (int iterations = 0; iterations < 1_000_000; iterations++)
{
// There are more interesting corner cases with ASCII needles, test those more.
Test(rng, s_randomChars, s_randomAsciiChars, expected, indexOfAny, indexOfAnyValues);

Test(rng, s_randomChars, s_randomLatin1Chars, expected, indexOfAny, indexOfAnyValues);

Test(rng, s_randomChars, s_randomChars, expected, indexOfAny, indexOfAnyValues);
}
}

private static void Test<T>(Random rng, ReadOnlySpan<T> haystackRandom, ReadOnlySpan<T> needleRandom,
IndexOfAnySearchDelegate<T> expected, IndexOfAnySearchDelegate<T> indexOfAny, IndexOfAnyValuesSearchDelegate<T> indexOfAnyValues)
where T : INumber<T>
{
ReadOnlySpan<T> haystack = GetRandomSlice(rng, haystackRandom, MaxHaystackLength);
ReadOnlySpan<T> needle = GetRandomSlice(rng, needleRandom, MaxNeedleLength);

IndexOfAnyValues<T> indexOfAnyValuesInstance = (IndexOfAnyValues<T>)(object)(typeof(T) == typeof(byte)
? IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(needle)), needle.Length))
: IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, char>(ref MemoryMarshal.GetReference(needle)), needle.Length)));

int expectedIndex = expected(haystack, needle);
int indexOfAnyIndex = indexOfAny(haystack, needle);
int indexOfAnyValuesIndex = indexOfAnyValues(haystack, indexOfAnyValuesInstance);

if (expectedIndex != indexOfAnyIndex)
{
AssertionFailed(haystack, needle, expectedIndex, indexOfAnyIndex, nameof(indexOfAny));
}

if (expectedIndex != indexOfAnyValuesIndex)
{
AssertionFailed(haystack, needle, expectedIndex, indexOfAnyValuesIndex, nameof(indexOfAnyValues));
}
}

private static ReadOnlySpan<T> GetRandomSlice<T>(Random rng, ReadOnlySpan<T> span, int maxLength)
{
ReadOnlySpan<T> slice = span.Slice(rng.Next(span.Length + 1));
return slice.Slice(0, Math.Min(slice.Length, rng.Next(maxLength + 1)));
}

private static void AssertionFailed<T>(ReadOnlySpan<T> haystack, ReadOnlySpan<T> needle, int expected, int actual, string approach)
where T : INumber<T>
{
string readableHaystack = string.Join(", ", haystack.ToString().Select(c => int.CreateChecked(c)));
string readableNeedle = string.Join(", ", needle.ToString().Select(c => int.CreateChecked(c)));

Assert.True(false, $"Expected {expected}, got {approach}={actual} for needle='{readableNeedle}', haystack='{readableHaystack}'");
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add IndexOfAnyValues.Contains#78996

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

 Merged

MihaZupan
merged 2 commits into

from

Nov 30, 2022
 Merged


Add IndexOfAnyValues.Contains
#78996
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4ac5920

Add IndexOfAnyValues.Contains


MihaZupan Nov 29, 2022
013fa36

Unsafe => unsafe


MihaZupan Nov 30, 2022

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


5 changes: 2 additions & 3 deletions
src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ internal sealed partial class TypeNameParser : IDisposable

 #region Private Data Members
 private readonly SafeTypeNameParserHandle m_NativeParser;
 private const string SpecialChars = ",[]&*+\\"; // see typeparse.h
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(SpecialChars);
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(",[]&*+\\"); // see typeparse.h
 #endregion

 #region Constructor and Disposer
Expand DownExpand Up@@ -289,7 +288,7 @@ private static string EscapeTypeName(string name)

 foreach (char c in name.AsSpan(specialCharIndex))
 {
 if (SpecialChars.Contains(c))
 if (s_specialChars.Contains(c))
 sb.Append('\\');

 sb.Append(c);
Expand Down

67 changes: 0 additions & 67 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.byte.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -530,73 +530,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Byte()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Byte()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<byte> searchSpace, ReadOnlySpan<byte> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Byte(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<byte> needleValues = needleContainsZero ? "AEIOU\0"u8 : "AEIOU!"u8;
 IndexOfAnyValues<byte> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<byte> repeatingHaystack = "AaAaAaAaAaAa"u8;
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<byte> haystackWithZeroes = "Aa\0Aa\0Aa\0"u8;
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<byte> haystackWithOffsetNeedle = new byte[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (byte)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<byte> span, byte value)
 {
 int index = span.IndexOf(value);
Expand Down

203 changes: 0 additions & 203 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.char.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System.Buffers;
using System.Linq;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Xunit;

namespace System.SpanTests
Expand DownExpand Up@@ -776,95 +773,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Char()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Char()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<char> searchSpace, ReadOnlySpan<char> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Char(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<char> needleValues = needleContainsZero ? "AEIOU\0" : "AEIOU!";
 IndexOfAnyValues<char> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<char> repeatingHaystack = "AaAaAaAaAaAa";
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<char> haystackWithZeroes = "Aa\0Aa\0Aa\0";
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<char> haystackWithOffsetNeedle = new char[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // With chars, the lower byte could be matching, but we have to check that the higher byte is also 0
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(((i + 1) * 256) + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<char> span, char value)
 {
 int index = span.IndexOf(value);
Expand DownExpand Up@@ -893,115 +801,4 @@ private static int IndexOfAny(Span<char> span, ReadOnlySpan<char> values)
 return index;
 }
 }

 public static class IndexOfAnyCharTestHelper
 {
 private const int MaxNeedleLength = 10;
 private const int MaxHaystackLength = 40;

 private static readonly char[] s_randomAsciiChars;
 private static readonly char[] s_randomLatin1Chars;
 private static readonly char[] s_randomChars;
 private static readonly byte[] s_randomAsciiBytes;
 private static readonly byte[] s_randomBytes;

 static IndexOfAnyCharTestHelper()
 {
 s_randomAsciiChars = new char[100 * 1024];
 s_randomLatin1Chars = new char[100 * 1024];
 s_randomChars = new char[1024 * 1024];
 s_randomBytes = new byte[100 * 1024];

 var rng = new Random(42);

 for (int i = 0; i < s_randomAsciiChars.Length; i++)
 {
 s_randomAsciiChars[i] = (char)rng.Next(0, 128);
 }

 for (int i = 0; i < s_randomLatin1Chars.Length; i++)
 {
 s_randomLatin1Chars[i] = (char)rng.Next(0, 256);
 }

 rng.NextBytes(MemoryMarshal.Cast<char, byte>(s_randomChars));

 s_randomAsciiBytes = Encoding.ASCII.GetBytes(s_randomAsciiChars);

 rng.NextBytes(s_randomBytes);
 }

 public delegate int IndexOfAnySearchDelegate<T>(ReadOnlySpan<T> searchSpace, ReadOnlySpan<T> values) where T : IEquatable<T>?;

 public delegate int IndexOfAnyValuesSearchDelegate<T>(ReadOnlySpan<T> searchSpace, IndexOfAnyValues<T> values) where T : IEquatable<T>?;

 public static void TestRandomInputs(IndexOfAnySearchDelegate<byte> expected, IndexOfAnySearchDelegate<byte> indexOfAny, IndexOfAnyValuesSearchDelegate<byte> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomBytes, s_randomAsciiBytes, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomBytes, s_randomBytes, expected, indexOfAny, indexOfAnyValues);
 }
 }

 public static void TestRandomInputs(IndexOfAnySearchDelegate<char> expected, IndexOfAnySearchDelegate<char> indexOfAny, IndexOfAnyValuesSearchDelegate<char> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomChars, s_randomAsciiChars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomLatin1Chars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomChars, expected, indexOfAny, indexOfAnyValues);
 }
 }

 private static void Test<T>(Random rng, ReadOnlySpan<T> haystackRandom, ReadOnlySpan<T> needleRandom,
 IndexOfAnySearchDelegate<T> expected, IndexOfAnySearchDelegate<T> indexOfAny, IndexOfAnyValuesSearchDelegate<T> indexOfAnyValues)
 where T : INumber<T>
 {
 ReadOnlySpan<T> haystack = GetRandomSlice(rng, haystackRandom, MaxHaystackLength);
 ReadOnlySpan<T> needle = GetRandomSlice(rng, needleRandom, MaxNeedleLength);

 IndexOfAnyValues<T> indexOfAnyValuesInstance = (IndexOfAnyValues<T>)(object)(typeof(T) == typeof(byte)
 ? IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(needle)), needle.Length))
 : IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, char>(ref MemoryMarshal.GetReference(needle)), needle.Length)));

 int expectedIndex = expected(haystack, needle);
 int indexOfAnyIndex = indexOfAny(haystack, needle);
 int indexOfAnyValuesIndex = indexOfAnyValues(haystack, indexOfAnyValuesInstance);

 if (expectedIndex != indexOfAnyIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyIndex, nameof(indexOfAny));
 }

 if (expectedIndex != indexOfAnyValuesIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyValuesIndex, nameof(indexOfAnyValues));
 }
 }

 private static ReadOnlySpan<T> GetRandomSlice<T>(Random rng, ReadOnlySpan<T> span, int maxLength)
 {
 ReadOnlySpan<T> slice = span.Slice(rng.Next(span.Length + 1));
 return slice.Slice(0, Math.Min(slice.Length, rng.Next(maxLength + 1)));
 }

 private static void AssertionFailed<T>(ReadOnlySpan<T> haystack, ReadOnlySpan<T> needle, int expected, int actual, string approach)
 where T : INumber<T>
 {
 string readableHaystack = string.Join(", ", haystack.ToString().Select(c => int.CreateChecked(c)));
 string readableNeedle = string.Join(", ", needle.ToString().Select(c => int.CreateChecked(c)));

 Assert.True(false, $"Expected {expected}, got {approach}={actual} for needle='{readableNeedle}', haystack='{readableHaystack}'");
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add IndexOfAnyValues.Contains#78996

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

 Merged

MihaZupan
merged 2 commits into

from

Nov 30, 2022
 Merged


Add IndexOfAnyValues.Contains
#78996
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4ac5920

Add IndexOfAnyValues.Contains


MihaZupan Nov 29, 2022
013fa36

Unsafe => unsafe


MihaZupan Nov 30, 2022

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


5 changes: 2 additions & 3 deletions
src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ internal sealed partial class TypeNameParser : IDisposable

 #region Private Data Members
 private readonly SafeTypeNameParserHandle m_NativeParser;
 private const string SpecialChars = ",[]&*+\\"; // see typeparse.h
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(SpecialChars);
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(",[]&*+\\"); // see typeparse.h
 #endregion

 #region Constructor and Disposer
Expand DownExpand Up@@ -289,7 +288,7 @@ private static string EscapeTypeName(string name)

 foreach (char c in name.AsSpan(specialCharIndex))
 {
 if (SpecialChars.Contains(c))
 if (s_specialChars.Contains(c))
 sb.Append('\\');

 sb.Append(c);
Expand Down

67 changes: 0 additions & 67 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.byte.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -530,73 +530,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Byte()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Byte()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<byte> searchSpace, ReadOnlySpan<byte> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Byte(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<byte> needleValues = needleContainsZero ? "AEIOU\0"u8 : "AEIOU!"u8;
 IndexOfAnyValues<byte> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<byte> repeatingHaystack = "AaAaAaAaAaAa"u8;
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<byte> haystackWithZeroes = "Aa\0Aa\0Aa\0"u8;
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<byte> haystackWithOffsetNeedle = new byte[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (byte)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<byte> span, byte value)
 {
 int index = span.IndexOf(value);
Expand Down

203 changes: 0 additions & 203 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.char.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System.Buffers;
using System.Linq;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Xunit;

namespace System.SpanTests
Expand DownExpand Up@@ -776,95 +773,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Char()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Char()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<char> searchSpace, ReadOnlySpan<char> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Char(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<char> needleValues = needleContainsZero ? "AEIOU\0" : "AEIOU!";
 IndexOfAnyValues<char> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<char> repeatingHaystack = "AaAaAaAaAaAa";
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<char> haystackWithZeroes = "Aa\0Aa\0Aa\0";
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<char> haystackWithOffsetNeedle = new char[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // With chars, the lower byte could be matching, but we have to check that the higher byte is also 0
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(((i + 1) * 256) + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<char> span, char value)
 {
 int index = span.IndexOf(value);
Expand DownExpand Up@@ -893,115 +801,4 @@ private static int IndexOfAny(Span<char> span, ReadOnlySpan<char> values)
 return index;
 }
 }

 public static class IndexOfAnyCharTestHelper
 {
 private const int MaxNeedleLength = 10;
 private const int MaxHaystackLength = 40;

 private static readonly char[] s_randomAsciiChars;
 private static readonly char[] s_randomLatin1Chars;
 private static readonly char[] s_randomChars;
 private static readonly byte[] s_randomAsciiBytes;
 private static readonly byte[] s_randomBytes;

 static IndexOfAnyCharTestHelper()
 {
 s_randomAsciiChars = new char[100 * 1024];
 s_randomLatin1Chars = new char[100 * 1024];
 s_randomChars = new char[1024 * 1024];
 s_randomBytes = new byte[100 * 1024];

 var rng = new Random(42);

 for (int i = 0; i < s_randomAsciiChars.Length; i++)
 {
 s_randomAsciiChars[i] = (char)rng.Next(0, 128);
 }

 for (int i = 0; i < s_randomLatin1Chars.Length; i++)
 {
 s_randomLatin1Chars[i] = (char)rng.Next(0, 256);
 }

 rng.NextBytes(MemoryMarshal.Cast<char, byte>(s_randomChars));

 s_randomAsciiBytes = Encoding.ASCII.GetBytes(s_randomAsciiChars);

 rng.NextBytes(s_randomBytes);
 }

 public delegate int IndexOfAnySearchDelegate<T>(ReadOnlySpan<T> searchSpace, ReadOnlySpan<T> values) where T : IEquatable<T>?;

 public delegate int IndexOfAnyValuesSearchDelegate<T>(ReadOnlySpan<T> searchSpace, IndexOfAnyValues<T> values) where T : IEquatable<T>?;

 public static void TestRandomInputs(IndexOfAnySearchDelegate<byte> expected, IndexOfAnySearchDelegate<byte> indexOfAny, IndexOfAnyValuesSearchDelegate<byte> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomBytes, s_randomAsciiBytes, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomBytes, s_randomBytes, expected, indexOfAny, indexOfAnyValues);
 }
 }

 public static void TestRandomInputs(IndexOfAnySearchDelegate<char> expected, IndexOfAnySearchDelegate<char> indexOfAny, IndexOfAnyValuesSearchDelegate<char> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomChars, s_randomAsciiChars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomLatin1Chars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomChars, expected, indexOfAny, indexOfAnyValues);
 }
 }

 private static void Test<T>(Random rng, ReadOnlySpan<T> haystackRandom, ReadOnlySpan<T> needleRandom,
 IndexOfAnySearchDelegate<T> expected, IndexOfAnySearchDelegate<T> indexOfAny, IndexOfAnyValuesSearchDelegate<T> indexOfAnyValues)
 where T : INumber<T>
 {
 ReadOnlySpan<T> haystack = GetRandomSlice(rng, haystackRandom, MaxHaystackLength);
 ReadOnlySpan<T> needle = GetRandomSlice(rng, needleRandom, MaxNeedleLength);

 IndexOfAnyValues<T> indexOfAnyValuesInstance = (IndexOfAnyValues<T>)(object)(typeof(T) == typeof(byte)
 ? IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(needle)), needle.Length))
 : IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, char>(ref MemoryMarshal.GetReference(needle)), needle.Length)));

 int expectedIndex = expected(haystack, needle);
 int indexOfAnyIndex = indexOfAny(haystack, needle);
 int indexOfAnyValuesIndex = indexOfAnyValues(haystack, indexOfAnyValuesInstance);

 if (expectedIndex != indexOfAnyIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyIndex, nameof(indexOfAny));
 }

 if (expectedIndex != indexOfAnyValuesIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyValuesIndex, nameof(indexOfAnyValues));
 }
 }

 private static ReadOnlySpan<T> GetRandomSlice<T>(Random rng, ReadOnlySpan<T> span, int maxLength)
 {
 ReadOnlySpan<T> slice = span.Slice(rng.Next(span.Length + 1));
 return slice.Slice(0, Math.Min(slice.Length, rng.Next(maxLength + 1)));
 }

 private static void AssertionFailed<T>(ReadOnlySpan<T> haystack, ReadOnlySpan<T> needle, int expected, int actual, string approach)
 where T : INumber<T>
 {
 string readableHaystack = string.Join(", ", haystack.ToString().Select(c => int.CreateChecked(c)));
 string readableNeedle = string.Join(", ", needle.ToString().Select(c => int.CreateChecked(c)));

 Assert.True(false, $"Expected {expected}, got {approach}={actual} for needle='{readableNeedle}', haystack='{readableHaystack}'");
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add IndexOfAnyValues.Contains#78996

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

 Merged

MihaZupan
merged 2 commits into

from

Nov 30, 2022
 Merged


Add IndexOfAnyValues.Contains
#78996
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4ac5920

Add IndexOfAnyValues.Contains


MihaZupan Nov 29, 2022
013fa36

Unsafe => unsafe


MihaZupan Nov 30, 2022

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


5 changes: 2 additions & 3 deletions
src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ internal sealed partial class TypeNameParser : IDisposable

 #region Private Data Members
 private readonly SafeTypeNameParserHandle m_NativeParser;
 private const string SpecialChars = ",[]&*+\\"; // see typeparse.h
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(SpecialChars);
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(",[]&*+\\"); // see typeparse.h
 #endregion

 #region Constructor and Disposer
Expand DownExpand Up@@ -289,7 +288,7 @@ private static string EscapeTypeName(string name)

 foreach (char c in name.AsSpan(specialCharIndex))
 {
 if (SpecialChars.Contains(c))
 if (s_specialChars.Contains(c))
 sb.Append('\\');

 sb.Append(c);
Expand Down

67 changes: 0 additions & 67 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.byte.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -530,73 +530,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Byte()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Byte()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<byte> searchSpace, ReadOnlySpan<byte> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Byte(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<byte> needleValues = needleContainsZero ? "AEIOU\0"u8 : "AEIOU!"u8;
 IndexOfAnyValues<byte> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<byte> repeatingHaystack = "AaAaAaAaAaAa"u8;
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<byte> haystackWithZeroes = "Aa\0Aa\0Aa\0"u8;
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<byte> haystackWithOffsetNeedle = new byte[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (byte)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<byte> span, byte value)
 {
 int index = span.IndexOf(value);
Expand Down

203 changes: 0 additions & 203 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.char.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System.Buffers;
using System.Linq;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Xunit;

namespace System.SpanTests
Expand DownExpand Up@@ -776,95 +773,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Char()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Char()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<char> searchSpace, ReadOnlySpan<char> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Char(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<char> needleValues = needleContainsZero ? "AEIOU\0" : "AEIOU!";
 IndexOfAnyValues<char> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<char> repeatingHaystack = "AaAaAaAaAaAa";
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<char> haystackWithZeroes = "Aa\0Aa\0Aa\0";
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<char> haystackWithOffsetNeedle = new char[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // With chars, the lower byte could be matching, but we have to check that the higher byte is also 0
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(((i + 1) * 256) + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<char> span, char value)
 {
 int index = span.IndexOf(value);
Expand DownExpand Up@@ -893,115 +801,4 @@ private static int IndexOfAny(Span<char> span, ReadOnlySpan<char> values)
 return index;
 }
 }

 public static class IndexOfAnyCharTestHelper
 {
 private const int MaxNeedleLength = 10;
 private const int MaxHaystackLength = 40;

 private static readonly char[] s_randomAsciiChars;
 private static readonly char[] s_randomLatin1Chars;
 private static readonly char[] s_randomChars;
 private static readonly byte[] s_randomAsciiBytes;
 private static readonly byte[] s_randomBytes;

 static IndexOfAnyCharTestHelper()
 {
 s_randomAsciiChars = new char[100 * 1024];
 s_randomLatin1Chars = new char[100 * 1024];
 s_randomChars = new char[1024 * 1024];
 s_randomBytes = new byte[100 * 1024];

 var rng = new Random(42);

 for (int i = 0; i < s_randomAsciiChars.Length; i++)
 {
 s_randomAsciiChars[i] = (char)rng.Next(0, 128);
 }

 for (int i = 0; i < s_randomLatin1Chars.Length; i++)
 {
 s_randomLatin1Chars[i] = (char)rng.Next(0, 256);
 }

 rng.NextBytes(MemoryMarshal.Cast<char, byte>(s_randomChars));

 s_randomAsciiBytes = Encoding.ASCII.GetBytes(s_randomAsciiChars);

 rng.NextBytes(s_randomBytes);
 }

 public delegate int IndexOfAnySearchDelegate<T>(ReadOnlySpan<T> searchSpace, ReadOnlySpan<T> values) where T : IEquatable<T>?;

 public delegate int IndexOfAnyValuesSearchDelegate<T>(ReadOnlySpan<T> searchSpace, IndexOfAnyValues<T> values) where T : IEquatable<T>?;

 public static void TestRandomInputs(IndexOfAnySearchDelegate<byte> expected, IndexOfAnySearchDelegate<byte> indexOfAny, IndexOfAnyValuesSearchDelegate<byte> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomBytes, s_randomAsciiBytes, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomBytes, s_randomBytes, expected, indexOfAny, indexOfAnyValues);
 }
 }

 public static void TestRandomInputs(IndexOfAnySearchDelegate<char> expected, IndexOfAnySearchDelegate<char> indexOfAny, IndexOfAnyValuesSearchDelegate<char> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomChars, s_randomAsciiChars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomLatin1Chars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomChars, expected, indexOfAny, indexOfAnyValues);
 }
 }

 private static void Test<T>(Random rng, ReadOnlySpan<T> haystackRandom, ReadOnlySpan<T> needleRandom,
 IndexOfAnySearchDelegate<T> expected, IndexOfAnySearchDelegate<T> indexOfAny, IndexOfAnyValuesSearchDelegate<T> indexOfAnyValues)
 where T : INumber<T>
 {
 ReadOnlySpan<T> haystack = GetRandomSlice(rng, haystackRandom, MaxHaystackLength);
 ReadOnlySpan<T> needle = GetRandomSlice(rng, needleRandom, MaxNeedleLength);

 IndexOfAnyValues<T> indexOfAnyValuesInstance = (IndexOfAnyValues<T>)(object)(typeof(T) == typeof(byte)
 ? IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(needle)), needle.Length))
 : IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, char>(ref MemoryMarshal.GetReference(needle)), needle.Length)));

 int expectedIndex = expected(haystack, needle);
 int indexOfAnyIndex = indexOfAny(haystack, needle);
 int indexOfAnyValuesIndex = indexOfAnyValues(haystack, indexOfAnyValuesInstance);

 if (expectedIndex != indexOfAnyIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyIndex, nameof(indexOfAny));
 }

 if (expectedIndex != indexOfAnyValuesIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyValuesIndex, nameof(indexOfAnyValues));
 }
 }

 private static ReadOnlySpan<T> GetRandomSlice<T>(Random rng, ReadOnlySpan<T> span, int maxLength)
 {
 ReadOnlySpan<T> slice = span.Slice(rng.Next(span.Length + 1));
 return slice.Slice(0, Math.Min(slice.Length, rng.Next(maxLength + 1)));
 }

 private static void AssertionFailed<T>(ReadOnlySpan<T> haystack, ReadOnlySpan<T> needle, int expected, int actual, string approach)
 where T : INumber<T>
 {
 string readableHaystack = string.Join(", ", haystack.ToString().Select(c => int.CreateChecked(c)));
 string readableNeedle = string.Join(", ", needle.ToString().Select(c => int.CreateChecked(c)));

 Assert.True(false, $"Expected {expected}, got {approach}={actual} for needle='{readableNeedle}', haystack='{readableHaystack}'");
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add IndexOfAnyValues.Contains#78996

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

 Merged

MihaZupan
merged 2 commits into

from

Nov 30, 2022
 Merged


Add IndexOfAnyValues.Contains
#78996
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4ac5920

Add IndexOfAnyValues.Contains


MihaZupan Nov 29, 2022
013fa36

Unsafe => unsafe


MihaZupan Nov 30, 2022

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


5 changes: 2 additions & 3 deletions
src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ internal sealed partial class TypeNameParser : IDisposable

 #region Private Data Members
 private readonly SafeTypeNameParserHandle m_NativeParser;
 private const string SpecialChars = ",[]&*+\\"; // see typeparse.h
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(SpecialChars);
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(",[]&*+\\"); // see typeparse.h
 #endregion

 #region Constructor and Disposer
Expand DownExpand Up@@ -289,7 +288,7 @@ private static string EscapeTypeName(string name)

 foreach (char c in name.AsSpan(specialCharIndex))
 {
 if (SpecialChars.Contains(c))
 if (s_specialChars.Contains(c))
 sb.Append('\\');

 sb.Append(c);
Expand Down

67 changes: 0 additions & 67 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.byte.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -530,73 +530,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Byte()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Byte()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<byte> searchSpace, ReadOnlySpan<byte> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Byte(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<byte> needleValues = needleContainsZero ? "AEIOU\0"u8 : "AEIOU!"u8;
 IndexOfAnyValues<byte> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<byte> repeatingHaystack = "AaAaAaAaAaAa"u8;
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<byte> haystackWithZeroes = "Aa\0Aa\0Aa\0"u8;
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<byte> haystackWithOffsetNeedle = new byte[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (byte)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<byte> span, byte value)
 {
 int index = span.IndexOf(value);
Expand Down

203 changes: 0 additions & 203 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.char.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System.Buffers;
using System.Linq;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Xunit;

namespace System.SpanTests
Expand DownExpand Up@@ -776,95 +773,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Char()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Char()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<char> searchSpace, ReadOnlySpan<char> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Char(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<char> needleValues = needleContainsZero ? "AEIOU\0" : "AEIOU!";
 IndexOfAnyValues<char> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<char> repeatingHaystack = "AaAaAaAaAaAa";
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<char> haystackWithZeroes = "Aa\0Aa\0Aa\0";
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<char> haystackWithOffsetNeedle = new char[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // With chars, the lower byte could be matching, but we have to check that the higher byte is also 0
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(((i + 1) * 256) + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<char> span, char value)
 {
 int index = span.IndexOf(value);
Expand DownExpand Up@@ -893,115 +801,4 @@ private static int IndexOfAny(Span<char> span, ReadOnlySpan<char> values)
 return index;
 }
 }

 public static class IndexOfAnyCharTestHelper
 {
 private const int MaxNeedleLength = 10;
 private const int MaxHaystackLength = 40;

 private static readonly char[] s_randomAsciiChars;
 private static readonly char[] s_randomLatin1Chars;
 private static readonly char[] s_randomChars;
 private static readonly byte[] s_randomAsciiBytes;
 private static readonly byte[] s_randomBytes;

 static IndexOfAnyCharTestHelper()
 {
 s_randomAsciiChars = new char[100 * 1024];
 s_randomLatin1Chars = new char[100 * 1024];
 s_randomChars = new char[1024 * 1024];
 s_randomBytes = new byte[100 * 1024];

 var rng = new Random(42);

 for (int i = 0; i < s_randomAsciiChars.Length; i++)
 {
 s_randomAsciiChars[i] = (char)rng.Next(0, 128);
 }

 for (int i = 0; i < s_randomLatin1Chars.Length; i++)
 {
 s_randomLatin1Chars[i] = (char)rng.Next(0, 256);
 }

 rng.NextBytes(MemoryMarshal.Cast<char, byte>(s_randomChars));

 s_randomAsciiBytes = Encoding.ASCII.GetBytes(s_randomAsciiChars);

 rng.NextBytes(s_randomBytes);
 }

 public delegate int IndexOfAnySearchDelegate<T>(ReadOnlySpan<T> searchSpace, ReadOnlySpan<T> values) where T : IEquatable<T>?;

 public delegate int IndexOfAnyValuesSearchDelegate<T>(ReadOnlySpan<T> searchSpace, IndexOfAnyValues<T> values) where T : IEquatable<T>?;

 public static void TestRandomInputs(IndexOfAnySearchDelegate<byte> expected, IndexOfAnySearchDelegate<byte> indexOfAny, IndexOfAnyValuesSearchDelegate<byte> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomBytes, s_randomAsciiBytes, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomBytes, s_randomBytes, expected, indexOfAny, indexOfAnyValues);
 }
 }

 public static void TestRandomInputs(IndexOfAnySearchDelegate<char> expected, IndexOfAnySearchDelegate<char> indexOfAny, IndexOfAnyValuesSearchDelegate<char> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomChars, s_randomAsciiChars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomLatin1Chars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomChars, expected, indexOfAny, indexOfAnyValues);
 }
 }

 private static void Test<T>(Random rng, ReadOnlySpan<T> haystackRandom, ReadOnlySpan<T> needleRandom,
 IndexOfAnySearchDelegate<T> expected, IndexOfAnySearchDelegate<T> indexOfAny, IndexOfAnyValuesSearchDelegate<T> indexOfAnyValues)
 where T : INumber<T>
 {
 ReadOnlySpan<T> haystack = GetRandomSlice(rng, haystackRandom, MaxHaystackLength);
 ReadOnlySpan<T> needle = GetRandomSlice(rng, needleRandom, MaxNeedleLength);

 IndexOfAnyValues<T> indexOfAnyValuesInstance = (IndexOfAnyValues<T>)(object)(typeof(T) == typeof(byte)
 ? IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(needle)), needle.Length))
 : IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, char>(ref MemoryMarshal.GetReference(needle)), needle.Length)));

 int expectedIndex = expected(haystack, needle);
 int indexOfAnyIndex = indexOfAny(haystack, needle);
 int indexOfAnyValuesIndex = indexOfAnyValues(haystack, indexOfAnyValuesInstance);

 if (expectedIndex != indexOfAnyIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyIndex, nameof(indexOfAny));
 }

 if (expectedIndex != indexOfAnyValuesIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyValuesIndex, nameof(indexOfAnyValues));
 }
 }

 private static ReadOnlySpan<T> GetRandomSlice<T>(Random rng, ReadOnlySpan<T> span, int maxLength)
 {
 ReadOnlySpan<T> slice = span.Slice(rng.Next(span.Length + 1));
 return slice.Slice(0, Math.Min(slice.Length, rng.Next(maxLength + 1)));
 }

 private static void AssertionFailed<T>(ReadOnlySpan<T> haystack, ReadOnlySpan<T> needle, int expected, int actual, string approach)
 where T : INumber<T>
 {
 string readableHaystack = string.Join(", ", haystack.ToString().Select(c => int.CreateChecked(c)));
 string readableNeedle = string.Join(", ", needle.ToString().Select(c => int.CreateChecked(c)));

 Assert.True(false, $"Expected {expected}, got {approach}={actual} for needle='{readableNeedle}', haystack='{readableHaystack}'");
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add IndexOfAnyValues.Contains#78996

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

 Merged

MihaZupan
merged 2 commits into

from

Nov 30, 2022
 Merged


Add IndexOfAnyValues.Contains
#78996
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4ac5920

Add IndexOfAnyValues.Contains


MihaZupan Nov 29, 2022
013fa36

Unsafe => unsafe


MihaZupan Nov 30, 2022

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


5 changes: 2 additions & 3 deletions
src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ internal sealed partial class TypeNameParser : IDisposable

 #region Private Data Members
 private readonly SafeTypeNameParserHandle m_NativeParser;
 private const string SpecialChars = ",[]&*+\\"; // see typeparse.h
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(SpecialChars);
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(",[]&*+\\"); // see typeparse.h
 #endregion

 #region Constructor and Disposer
Expand DownExpand Up@@ -289,7 +288,7 @@ private static string EscapeTypeName(string name)

 foreach (char c in name.AsSpan(specialCharIndex))
 {
 if (SpecialChars.Contains(c))
 if (s_specialChars.Contains(c))
 sb.Append('\\');

 sb.Append(c);
Expand Down

67 changes: 0 additions & 67 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.byte.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -530,73 +530,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Byte()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Byte()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<byte> searchSpace, ReadOnlySpan<byte> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Byte(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<byte> needleValues = needleContainsZero ? "AEIOU\0"u8 : "AEIOU!"u8;
 IndexOfAnyValues<byte> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<byte> repeatingHaystack = "AaAaAaAaAaAa"u8;
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<byte> haystackWithZeroes = "Aa\0Aa\0Aa\0"u8;
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<byte> haystackWithOffsetNeedle = new byte[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (byte)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<byte> span, byte value)
 {
 int index = span.IndexOf(value);
Expand Down

203 changes: 0 additions & 203 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.char.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System.Buffers;
using System.Linq;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Xunit;

namespace System.SpanTests
Expand DownExpand Up@@ -776,95 +773,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Char()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Char()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<char> searchSpace, ReadOnlySpan<char> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Char(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<char> needleValues = needleContainsZero ? "AEIOU\0" : "AEIOU!";
 IndexOfAnyValues<char> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<char> repeatingHaystack = "AaAaAaAaAaAa";
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<char> haystackWithZeroes = "Aa\0Aa\0Aa\0";
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<char> haystackWithOffsetNeedle = new char[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // With chars, the lower byte could be matching, but we have to check that the higher byte is also 0
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(((i + 1) * 256) + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<char> span, char value)
 {
 int index = span.IndexOf(value);
Expand DownExpand Up@@ -893,115 +801,4 @@ private static int IndexOfAny(Span<char> span, ReadOnlySpan<char> values)
 return index;
 }
 }

 public static class IndexOfAnyCharTestHelper
 {
 private const int MaxNeedleLength = 10;
 private const int MaxHaystackLength = 40;

 private static readonly char[] s_randomAsciiChars;
 private static readonly char[] s_randomLatin1Chars;
 private static readonly char[] s_randomChars;
 private static readonly byte[] s_randomAsciiBytes;
 private static readonly byte[] s_randomBytes;

 static IndexOfAnyCharTestHelper()
 {
 s_randomAsciiChars = new char[100 * 1024];
 s_randomLatin1Chars = new char[100 * 1024];
 s_randomChars = new char[1024 * 1024];
 s_randomBytes = new byte[100 * 1024];

 var rng = new Random(42);

 for (int i = 0; i < s_randomAsciiChars.Length; i++)
 {
 s_randomAsciiChars[i] = (char)rng.Next(0, 128);
 }

 for (int i = 0; i < s_randomLatin1Chars.Length; i++)
 {
 s_randomLatin1Chars[i] = (char)rng.Next(0, 256);
 }

 rng.NextBytes(MemoryMarshal.Cast<char, byte>(s_randomChars));

 s_randomAsciiBytes = Encoding.ASCII.GetBytes(s_randomAsciiChars);

 rng.NextBytes(s_randomBytes);
 }

 public delegate int IndexOfAnySearchDelegate<T>(ReadOnlySpan<T> searchSpace, ReadOnlySpan<T> values) where T : IEquatable<T>?;

 public delegate int IndexOfAnyValuesSearchDelegate<T>(ReadOnlySpan<T> searchSpace, IndexOfAnyValues<T> values) where T : IEquatable<T>?;

 public static void TestRandomInputs(IndexOfAnySearchDelegate<byte> expected, IndexOfAnySearchDelegate<byte> indexOfAny, IndexOfAnyValuesSearchDelegate<byte> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomBytes, s_randomAsciiBytes, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomBytes, s_randomBytes, expected, indexOfAny, indexOfAnyValues);
 }
 }

 public static void TestRandomInputs(IndexOfAnySearchDelegate<char> expected, IndexOfAnySearchDelegate<char> indexOfAny, IndexOfAnyValuesSearchDelegate<char> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomChars, s_randomAsciiChars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomLatin1Chars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomChars, expected, indexOfAny, indexOfAnyValues);
 }
 }

 private static void Test<T>(Random rng, ReadOnlySpan<T> haystackRandom, ReadOnlySpan<T> needleRandom,
 IndexOfAnySearchDelegate<T> expected, IndexOfAnySearchDelegate<T> indexOfAny, IndexOfAnyValuesSearchDelegate<T> indexOfAnyValues)
 where T : INumber<T>
 {
 ReadOnlySpan<T> haystack = GetRandomSlice(rng, haystackRandom, MaxHaystackLength);
 ReadOnlySpan<T> needle = GetRandomSlice(rng, needleRandom, MaxNeedleLength);

 IndexOfAnyValues<T> indexOfAnyValuesInstance = (IndexOfAnyValues<T>)(object)(typeof(T) == typeof(byte)
 ? IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(needle)), needle.Length))
 : IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, char>(ref MemoryMarshal.GetReference(needle)), needle.Length)));

 int expectedIndex = expected(haystack, needle);
 int indexOfAnyIndex = indexOfAny(haystack, needle);
 int indexOfAnyValuesIndex = indexOfAnyValues(haystack, indexOfAnyValuesInstance);

 if (expectedIndex != indexOfAnyIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyIndex, nameof(indexOfAny));
 }

 if (expectedIndex != indexOfAnyValuesIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyValuesIndex, nameof(indexOfAnyValues));
 }
 }

 private static ReadOnlySpan<T> GetRandomSlice<T>(Random rng, ReadOnlySpan<T> span, int maxLength)
 {
 ReadOnlySpan<T> slice = span.Slice(rng.Next(span.Length + 1));
 return slice.Slice(0, Math.Min(slice.Length, rng.Next(maxLength + 1)));
 }

 private static void AssertionFailed<T>(ReadOnlySpan<T> haystack, ReadOnlySpan<T> needle, int expected, int actual, string approach)
 where T : INumber<T>
 {
 string readableHaystack = string.Join(", ", haystack.ToString().Select(c => int.CreateChecked(c)));
 string readableNeedle = string.Join(", ", needle.ToString().Select(c => int.CreateChecked(c)));

 Assert.True(false, $"Expected {expected}, got {approach}={actual} for needle='{readableNeedle}', haystack='{readableHaystack}'");
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add IndexOfAnyValues.Contains#78996

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

 Merged

MihaZupan
merged 2 commits into

from

Nov 30, 2022
 Merged


Add IndexOfAnyValues.Contains
#78996
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4ac5920

Add IndexOfAnyValues.Contains


MihaZupan Nov 29, 2022
013fa36

Unsafe => unsafe


MihaZupan Nov 30, 2022

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


5 changes: 2 additions & 3 deletions
src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ internal sealed partial class TypeNameParser : IDisposable

 #region Private Data Members
 private readonly SafeTypeNameParserHandle m_NativeParser;
 private const string SpecialChars = ",[]&*+\\"; // see typeparse.h
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(SpecialChars);
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(",[]&*+\\"); // see typeparse.h
 #endregion

 #region Constructor and Disposer
Expand DownExpand Up@@ -289,7 +288,7 @@ private static string EscapeTypeName(string name)

 foreach (char c in name.AsSpan(specialCharIndex))
 {
 if (SpecialChars.Contains(c))
 if (s_specialChars.Contains(c))
 sb.Append('\\');

 sb.Append(c);
Expand Down

67 changes: 0 additions & 67 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.byte.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -530,73 +530,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Byte()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Byte()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<byte> searchSpace, ReadOnlySpan<byte> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Byte(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<byte> needleValues = needleContainsZero ? "AEIOU\0"u8 : "AEIOU!"u8;
 IndexOfAnyValues<byte> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<byte> repeatingHaystack = "AaAaAaAaAaAa"u8;
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<byte> haystackWithZeroes = "Aa\0Aa\0Aa\0"u8;
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<byte> haystackWithOffsetNeedle = new byte[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (byte)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<byte> span, byte value)
 {
 int index = span.IndexOf(value);
Expand Down

203 changes: 0 additions & 203 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.char.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System.Buffers;
using System.Linq;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Xunit;

namespace System.SpanTests
Expand DownExpand Up@@ -776,95 +773,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Char()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Char()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<char> searchSpace, ReadOnlySpan<char> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Char(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<char> needleValues = needleContainsZero ? "AEIOU\0" : "AEIOU!";
 IndexOfAnyValues<char> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<char> repeatingHaystack = "AaAaAaAaAaAa";
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<char> haystackWithZeroes = "Aa\0Aa\0Aa\0";
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<char> haystackWithOffsetNeedle = new char[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // With chars, the lower byte could be matching, but we have to check that the higher byte is also 0
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(((i + 1) * 256) + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<char> span, char value)
 {
 int index = span.IndexOf(value);
Expand DownExpand Up@@ -893,115 +801,4 @@ private static int IndexOfAny(Span<char> span, ReadOnlySpan<char> values)
 return index;
 }
 }

 public static class IndexOfAnyCharTestHelper
 {
 private const int MaxNeedleLength = 10;
 private const int MaxHaystackLength = 40;

 private static readonly char[] s_randomAsciiChars;
 private static readonly char[] s_randomLatin1Chars;
 private static readonly char[] s_randomChars;
 private static readonly byte[] s_randomAsciiBytes;
 private static readonly byte[] s_randomBytes;

 static IndexOfAnyCharTestHelper()
 {
 s_randomAsciiChars = new char[100 * 1024];
 s_randomLatin1Chars = new char[100 * 1024];
 s_randomChars = new char[1024 * 1024];
 s_randomBytes = new byte[100 * 1024];

 var rng = new Random(42);

 for (int i = 0; i < s_randomAsciiChars.Length; i++)
 {
 s_randomAsciiChars[i] = (char)rng.Next(0, 128);
 }

 for (int i = 0; i < s_randomLatin1Chars.Length; i++)
 {
 s_randomLatin1Chars[i] = (char)rng.Next(0, 256);
 }

 rng.NextBytes(MemoryMarshal.Cast<char, byte>(s_randomChars));

 s_randomAsciiBytes = Encoding.ASCII.GetBytes(s_randomAsciiChars);

 rng.NextBytes(s_randomBytes);
 }

 public delegate int IndexOfAnySearchDelegate<T>(ReadOnlySpan<T> searchSpace, ReadOnlySpan<T> values) where T : IEquatable<T>?;

 public delegate int IndexOfAnyValuesSearchDelegate<T>(ReadOnlySpan<T> searchSpace, IndexOfAnyValues<T> values) where T : IEquatable<T>?;

 public static void TestRandomInputs(IndexOfAnySearchDelegate<byte> expected, IndexOfAnySearchDelegate<byte> indexOfAny, IndexOfAnyValuesSearchDelegate<byte> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomBytes, s_randomAsciiBytes, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomBytes, s_randomBytes, expected, indexOfAny, indexOfAnyValues);
 }
 }

 public static void TestRandomInputs(IndexOfAnySearchDelegate<char> expected, IndexOfAnySearchDelegate<char> indexOfAny, IndexOfAnyValuesSearchDelegate<char> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomChars, s_randomAsciiChars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomLatin1Chars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomChars, expected, indexOfAny, indexOfAnyValues);
 }
 }

 private static void Test<T>(Random rng, ReadOnlySpan<T> haystackRandom, ReadOnlySpan<T> needleRandom,
 IndexOfAnySearchDelegate<T> expected, IndexOfAnySearchDelegate<T> indexOfAny, IndexOfAnyValuesSearchDelegate<T> indexOfAnyValues)
 where T : INumber<T>
 {
 ReadOnlySpan<T> haystack = GetRandomSlice(rng, haystackRandom, MaxHaystackLength);
 ReadOnlySpan<T> needle = GetRandomSlice(rng, needleRandom, MaxNeedleLength);

 IndexOfAnyValues<T> indexOfAnyValuesInstance = (IndexOfAnyValues<T>)(object)(typeof(T) == typeof(byte)
 ? IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(needle)), needle.Length))
 : IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, char>(ref MemoryMarshal.GetReference(needle)), needle.Length)));

 int expectedIndex = expected(haystack, needle);
 int indexOfAnyIndex = indexOfAny(haystack, needle);
 int indexOfAnyValuesIndex = indexOfAnyValues(haystack, indexOfAnyValuesInstance);

 if (expectedIndex != indexOfAnyIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyIndex, nameof(indexOfAny));
 }

 if (expectedIndex != indexOfAnyValuesIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyValuesIndex, nameof(indexOfAnyValues));
 }
 }

 private static ReadOnlySpan<T> GetRandomSlice<T>(Random rng, ReadOnlySpan<T> span, int maxLength)
 {
 ReadOnlySpan<T> slice = span.Slice(rng.Next(span.Length + 1));
 return slice.Slice(0, Math.Min(slice.Length, rng.Next(maxLength + 1)));
 }

 private static void AssertionFailed<T>(ReadOnlySpan<T> haystack, ReadOnlySpan<T> needle, int expected, int actual, string approach)
 where T : INumber<T>
 {
 string readableHaystack = string.Join(", ", haystack.ToString().Select(c => int.CreateChecked(c)));
 string readableNeedle = string.Join(", ", needle.ToString().Select(c => int.CreateChecked(c)));

 Assert.True(false, $"Expected {expected}, got {approach}={actual} for needle='{readableNeedle}', haystack='{readableHaystack}'");
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add IndexOfAnyValues.Contains#78996

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

 Merged

MihaZupan
merged 2 commits into

from

Nov 30, 2022
 Merged


Add IndexOfAnyValues.Contains
#78996
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4ac5920

Add IndexOfAnyValues.Contains


MihaZupan Nov 29, 2022
013fa36

Unsafe => unsafe


MihaZupan Nov 30, 2022

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


5 changes: 2 additions & 3 deletions
src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,7 @@ internal sealed partial class TypeNameParser : IDisposable

 #region Private Data Members
 private readonly SafeTypeNameParserHandle m_NativeParser;
 private const string SpecialChars = ",[]&*+\\"; // see typeparse.h
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(SpecialChars);
 private static readonly IndexOfAnyValues<char> s_specialChars = IndexOfAnyValues.Create(",[]&*+\\"); // see typeparse.h
 #endregion

 #region Constructor and Disposer
Expand DownExpand Up@@ -289,7 +288,7 @@ private static string EscapeTypeName(string name)

 foreach (char c in name.AsSpan(specialCharIndex))
 {
 if (SpecialChars.Contains(c))
 if (s_specialChars.Contains(c))
 sb.Append('\\');

 sb.Append(c);
Expand Down

67 changes: 0 additions & 67 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.byte.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -530,73 +530,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Byte()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Byte()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<byte> searchSpace, ReadOnlySpan<byte> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Byte(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<byte> needleValues = needleContainsZero ? "AEIOU\0"u8 : "AEIOU!"u8;
 IndexOfAnyValues<byte> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<byte> repeatingHaystack = "AaAaAaAaAaAa"u8;
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<byte> haystackWithZeroes = "Aa\0Aa\0Aa\0"u8;
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<byte> haystackWithOffsetNeedle = new byte[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (byte)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<byte> span, byte value)
 {
 int index = span.IndexOf(value);
Expand Down

203 changes: 0 additions & 203 deletions
src/libraries/System.Memory/tests/Span/IndexOfAny.char.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System.Buffers;
using System.Linq;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Xunit;

namespace System.SpanTests
Expand DownExpand Up@@ -776,95 +773,6 @@ public static void MakeSureNoChecksGoOutOfRangeMany_Char()
 }
 }

 [Fact]
 [OuterLoop("Takes about a second to execute")]
 public static void TestIndexOfAny_RandomInputs_Char()
 {
 IndexOfAnyCharTestHelper.TestRandomInputs(
 expected: IndexOfAnyReferenceImpl,
 indexOfAny: (searchSpace, values) => searchSpace.IndexOfAny(values),
 indexOfAnyValues: (searchSpace, values) => searchSpace.IndexOfAny(values));

 static int IndexOfAnyReferenceImpl(ReadOnlySpan<char> searchSpace, ReadOnlySpan<char> values)
 {
 for (int i = 0; i < searchSpace.Length; i++)
 {
 if (values.Contains(searchSpace[i]))
 {
 return i;
 }
 }

 return -1;
 }
 }

 [Theory]
 [InlineData(true)]
 [InlineData(false)]
 public static void AsciiNeedle_ProperlyHandlesEdgeCases_Char(bool needleContainsZero)
 {
 // There is some special handling we have to do for ASCII needles to properly filter out non-ASCII results
 ReadOnlySpan<char> needleValues = needleContainsZero ? "AEIOU\0" : "AEIOU!";
 IndexOfAnyValues<char> needle = IndexOfAnyValues.Create(needleValues);

 ReadOnlySpan<char> repeatingHaystack = "AaAaAaAaAaAa";
 Assert.Equal(0, repeatingHaystack.IndexOfAny(needle));
 Assert.Equal(1, repeatingHaystack.IndexOfAnyExcept(needle));
 Assert.Equal(10, repeatingHaystack.LastIndexOfAny(needle));
 Assert.Equal(11, repeatingHaystack.LastIndexOfAnyExcept(needle));

 ReadOnlySpan<char> haystackWithZeroes = "Aa\0Aa\0Aa\0";
 Assert.Equal(0, haystackWithZeroes.IndexOfAny(needle));
 Assert.Equal(1, haystackWithZeroes.IndexOfAnyExcept(needle));
 Assert.Equal(needleContainsZero ? 8 : 6, haystackWithZeroes.LastIndexOfAny(needle));
 Assert.Equal(needleContainsZero ? 7 : 8, haystackWithZeroes.LastIndexOfAnyExcept(needle));

 Span<char> haystackWithOffsetNeedle = new char[100];
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(128 + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // With chars, the lower byte could be matching, but we have to check that the higher byte is also 0
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i++)
 {
 haystackWithOffsetNeedle[i] = (char)(((i + 1) * 256) + needleValues[i % needleValues.Length]);
 }

 Assert.Equal(-1, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(-1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));

 // Mix matching characters back in
 for (int i = 0; i < haystackWithOffsetNeedle.Length; i += 3)
 {
 haystackWithOffsetNeedle[i] = needleValues[i % needleValues.Length];
 }

 Assert.Equal(0, haystackWithOffsetNeedle.IndexOfAny(needle));
 Assert.Equal(1, haystackWithOffsetNeedle.IndexOfAnyExcept(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 1, haystackWithOffsetNeedle.LastIndexOfAny(needle));
 Assert.Equal(haystackWithOffsetNeedle.Length - 2, haystackWithOffsetNeedle.LastIndexOfAnyExcept(needle));
 }

 private static int IndexOf(Span<char> span, char value)
 {
 int index = span.IndexOf(value);
Expand DownExpand Up@@ -893,115 +801,4 @@ private static int IndexOfAny(Span<char> span, ReadOnlySpan<char> values)
 return index;
 }
 }

 public static class IndexOfAnyCharTestHelper
 {
 private const int MaxNeedleLength = 10;
 private const int MaxHaystackLength = 40;

 private static readonly char[] s_randomAsciiChars;
 private static readonly char[] s_randomLatin1Chars;
 private static readonly char[] s_randomChars;
 private static readonly byte[] s_randomAsciiBytes;
 private static readonly byte[] s_randomBytes;

 static IndexOfAnyCharTestHelper()
 {
 s_randomAsciiChars = new char[100 * 1024];
 s_randomLatin1Chars = new char[100 * 1024];
 s_randomChars = new char[1024 * 1024];
 s_randomBytes = new byte[100 * 1024];

 var rng = new Random(42);

 for (int i = 0; i < s_randomAsciiChars.Length; i++)
 {
 s_randomAsciiChars[i] = (char)rng.Next(0, 128);
 }

 for (int i = 0; i < s_randomLatin1Chars.Length; i++)
 {
 s_randomLatin1Chars[i] = (char)rng.Next(0, 256);
 }

 rng.NextBytes(MemoryMarshal.Cast<char, byte>(s_randomChars));

 s_randomAsciiBytes = Encoding.ASCII.GetBytes(s_randomAsciiChars);

 rng.NextBytes(s_randomBytes);
 }

 public delegate int IndexOfAnySearchDelegate<T>(ReadOnlySpan<T> searchSpace, ReadOnlySpan<T> values) where T : IEquatable<T>?;

 public delegate int IndexOfAnyValuesSearchDelegate<T>(ReadOnlySpan<T> searchSpace, IndexOfAnyValues<T> values) where T : IEquatable<T>?;

 public static void TestRandomInputs(IndexOfAnySearchDelegate<byte> expected, IndexOfAnySearchDelegate<byte> indexOfAny, IndexOfAnyValuesSearchDelegate<byte> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomBytes, s_randomAsciiBytes, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomBytes, s_randomBytes, expected, indexOfAny, indexOfAnyValues);
 }
 }

 public static void TestRandomInputs(IndexOfAnySearchDelegate<char> expected, IndexOfAnySearchDelegate<char> indexOfAny, IndexOfAnyValuesSearchDelegate<char> indexOfAnyValues)
 {
 var rng = new Random(42);

 for (int iterations = 0; iterations < 1_000_000; iterations++)
 {
 // There are more interesting corner cases with ASCII needles, test those more.
 Test(rng, s_randomChars, s_randomAsciiChars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomLatin1Chars, expected, indexOfAny, indexOfAnyValues);

 Test(rng, s_randomChars, s_randomChars, expected, indexOfAny, indexOfAnyValues);
 }
 }

 private static void Test<T>(Random rng, ReadOnlySpan<T> haystackRandom, ReadOnlySpan<T> needleRandom,
 IndexOfAnySearchDelegate<T> expected, IndexOfAnySearchDelegate<T> indexOfAny, IndexOfAnyValuesSearchDelegate<T> indexOfAnyValues)
 where T : INumber<T>
 {
 ReadOnlySpan<T> haystack = GetRandomSlice(rng, haystackRandom, MaxHaystackLength);
 ReadOnlySpan<T> needle = GetRandomSlice(rng, needleRandom, MaxNeedleLength);

 IndexOfAnyValues<T> indexOfAnyValuesInstance = (IndexOfAnyValues<T>)(object)(typeof(T) == typeof(byte)
 ? IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(needle)), needle.Length))
 : IndexOfAnyValues.Create(MemoryMarshal.CreateReadOnlySpan(ref Unsafe.As<T, char>(ref MemoryMarshal.GetReference(needle)), needle.Length)));

 int expectedIndex = expected(haystack, needle);
 int indexOfAnyIndex = indexOfAny(haystack, needle);
 int indexOfAnyValuesIndex = indexOfAnyValues(haystack, indexOfAnyValuesInstance);

 if (expectedIndex != indexOfAnyIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyIndex, nameof(indexOfAny));
 }

 if (expectedIndex != indexOfAnyValuesIndex)
 {
 AssertionFailed(haystack, needle, expectedIndex, indexOfAnyValuesIndex, nameof(indexOfAnyValues));
 }
 }

 private static ReadOnlySpan<T> GetRandomSlice<T>(Random rng, ReadOnlySpan<T> span, int maxLength)
 {
 ReadOnlySpan<T> slice = span.Slice(rng.Next(span.Length + 1));
 return slice.Slice(0, Math.Min(slice.Length, rng.Next(maxLength + 1)));
 }

 private static void AssertionFailed<T>(ReadOnlySpan<T> haystack, ReadOnlySpan<T> needle, int expected, int actual, string approach)
 where T : INumber<T>
 {
 string readableHaystack = string.Join(", ", haystack.ToString().Select(c => int.CreateChecked(c)));
 string readableNeedle = string.Join(", ", needle.ToString().Select(c => int.CreateChecked(c)));

 Assert.True(false, $"Expected {expected}, got {approach}={actual} for needle='{readableNeedle}', haystack='{readableHaystack}'");
 }
 }
}
Loading